Merge branch 'charm' of charmgit:charm into charm
authorEmmanuel Jeannot <ejeannot@mobile-192-17-198-20.near.uiuc.edu>
Thu, 31 Mar 2011 16:51:21 +0000 (18:51 +0200)
committerEmmanuel Jeannot <ejeannot@mobile-192-17-198-20.near.uiuc.edu>
Thu, 31 Mar 2011 16:51:21 +0000 (18:51 +0200)
commitaf302f3bf2fd6ed997d3ffe18c9d30a337896f27
tree9cba87e7b96217d28e463b1b36d5b9c5dfa4958e
parent591e58a92254fa05f393316332e6638ff644d790
parent6d2db69bae14a026e0debc10223fb15498296ef8
Merge branch 'charm' of charmgit:charm into charm