Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Tue, 18 Sep 2012 16:21:51 +0000 (11:21 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Tue, 18 Sep 2012 16:21:51 +0000 (11:21 -0500)

Trivial merge