Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Thu, 28 Jan 2010 00:48:01 +0000 (18:48 -0600)
committerPhil Miller <mille121@illinois.edu>
Thu, 28 Jan 2010 00:48:01 +0000 (18:48 -0600)

Trivial merge