Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Thu, 1 Apr 2010 22:26:54 +0000 (17:26 -0500)
committerEric Bohm <ebohm@illinois.edu>
Thu, 1 Apr 2010 22:26:54 +0000 (17:26 -0500)

Trivial merge