Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Mon, 7 Dec 2009 16:24:40 +0000 (10:24 -0600)
committerPhil Miller <mille121@illinois.edu>
Mon, 7 Dec 2009 16:24:40 +0000 (10:24 -0600)

Trivial merge