Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Mon, 8 Oct 2012 14:44:11 +0000 (09:44 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Mon, 8 Oct 2012 14:44:11 +0000 (09:44 -0500)

Trivial merge