Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Tue, 28 Aug 2012 14:00:27 +0000 (09:00 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Tue, 28 Aug 2012 14:00:27 +0000 (09:00 -0500)

Trivial merge