Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Fri, 21 Sep 2012 19:33:16 +0000 (14:33 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Fri, 21 Sep 2012 19:33:16 +0000 (14:33 -0500)

Trivial merge