Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Wed, 20 Jan 2010 01:05:34 +0000 (19:05 -0600)
committerPhil Miller <mille121@illinois.edu>
Wed, 20 Jan 2010 01:05:34 +0000 (19:05 -0600)

Trivial merge