Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Mon, 2 Apr 2012 22:39:54 +0000 (17:39 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Mon, 2 Apr 2012 22:39:54 +0000 (17:39 -0500)

Trivial merge