Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Sat, 7 Jul 2012 21:01:26 +0000 (16:01 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Sat, 7 Jul 2012 21:01:26 +0000 (16:01 -0500)

Trivial merge