Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Fri, 20 Apr 2012 20:57:25 +0000 (15:57 -0500)
committerEsteban Meneses <emenese2@illinois.edu>
Fri, 20 Apr 2012 20:57:25 +0000 (15:57 -0500)

Trivial merge