Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Mon, 25 Jan 2010 23:16:51 +0000 (17:16 -0600)
committerEric Bohm <ebohm@illinois.edu>
Mon, 25 Jan 2010 23:16:51 +0000 (17:16 -0600)

Trivial merge