Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Tue, 9 Oct 2012 14:24:31 +0000 (09:24 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Tue, 9 Oct 2012 14:24:31 +0000 (09:24 -0500)

Trivial merge