Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Tue, 25 Jan 2011 22:03:20 +0000 (16:03 -0600)
committerEric Bohm <ebohm@illinois.edu>
Tue, 25 Jan 2011 22:03:20 +0000 (16:03 -0600)

Trivial merge