Merge branch 'charm' of charmgit:charm into charm
authorEmmanuel Jeannot <ejeannot@mobile-192-17-202-71.near.uiuc.edu>
Wed, 30 Mar 2011 16:09:42 +0000 (18:09 +0200)
committerEmmanuel Jeannot <ejeannot@mobile-192-17-202-71.near.uiuc.edu>
Wed, 30 Mar 2011 16:09:42 +0000 (18:09 +0200)

Trivial merge