Merge branch 'charm' of charmgit:charm into charm
authorRyan Mokos <mokos@illinois.edu>
Tue, 9 Nov 2010 21:27:02 +0000 (15:27 -0600)
committerRyan Mokos <mokos@illinois.edu>
Tue, 9 Nov 2010 21:27:02 +0000 (15:27 -0600)

Trivial merge