Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Fri, 14 Sep 2012 15:22:31 +0000 (10:22 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Fri, 14 Sep 2012 15:22:31 +0000 (10:22 -0500)

Trivial merge