Merge branch 'charm' of charmgit:charm into charm
authorEsteban Meneses <emenese2@illinois.edu>
Thu, 11 Mar 2010 19:58:10 +0000 (13:58 -0600)
committerEsteban Meneses <emenese2@illinois.edu>
Thu, 11 Mar 2010 19:58:10 +0000 (13:58 -0600)

Trivial merge