Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Fri, 23 Jul 2010 23:24:09 +0000 (18:24 -0500)
committerEric Bohm <ebohm@illinois.edu>
Fri, 23 Jul 2010 23:24:09 +0000 (18:24 -0500)

Trivial merge