Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Fri, 19 Oct 2012 15:15:09 +0000 (15:15 +0000)
committerEsteban Meneses <emenese2@illinois.edu>
Fri, 19 Oct 2012 15:15:09 +0000 (15:15 +0000)

Trivial merge