Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Thu, 3 May 2012 14:49:14 +0000 (09:49 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Thu, 3 May 2012 14:49:14 +0000 (09:49 -0500)

Trivial merge