Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Wed, 15 Dec 2010 05:13:50 +0000 (23:13 -0600)
committerEric Bohm <ebohm@illinois.edu>
Wed, 15 Dec 2010 05:13:50 +0000 (23:13 -0600)

Trivial merge