Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Mon, 21 Dec 2009 18:14:35 +0000 (12:14 -0600)
committerPhil Miller <mille121@illinois.edu>
Mon, 21 Dec 2009 18:14:35 +0000 (12:14 -0600)

Trivial merge