Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Fri, 12 Mar 2010 01:27:41 +0000 (19:27 -0600)
committerPhil Miller <mille121@illinois.edu>
Fri, 12 Mar 2010 01:27:41 +0000 (19:27 -0600)

Trivial merge