Merge branch 'charm' of charmgit:charm into charm
authorJoAnne Geigner <jgeigner@illinois.edu>
Mon, 25 Oct 2010 21:32:46 +0000 (16:32 -0500)
committerJoAnne Geigner <jgeigner@illinois.edu>
Mon, 25 Oct 2010 21:32:46 +0000 (16:32 -0500)

Trivial merge