Merge branch 'charm' of charmgit:charm into charm
authorRyan Mokos <mokos@illinois.edu>
Fri, 26 Mar 2010 23:24:02 +0000 (18:24 -0500)
committerRyan Mokos <mokos@illinois.edu>
Fri, 26 Mar 2010 23:24:02 +0000 (18:24 -0500)

Trivial merge