Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Thu, 11 Feb 2010 18:23:30 +0000 (12:23 -0600)
committerPhil Miller <mille121@illinois.edu>
Thu, 11 Feb 2010 18:23:30 +0000 (12:23 -0600)

Trivial merge