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

Trivial merge