Merge branch 'charm' of charmgit:charm into charm
authorPhil Miller <mille121@illinois.edu>
Tue, 27 Dec 2011 05:04:02 +0000 (23:04 -0600)
committerPhil Miller <mille121@illinois.edu>
Tue, 27 Dec 2011 05:04:02 +0000 (23:04 -0600)

Trivial merge