Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Thu, 5 Jul 2012 03:31:01 +0000 (22:31 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Thu, 5 Jul 2012 03:31:01 +0000 (22:31 -0500)

Trivial merge