Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Fri, 5 Mar 2010 20:32:25 +0000 (14:32 -0600)
committerEric Bohm <ebohm@illinois.edu>
Fri, 5 Mar 2010 20:32:25 +0000 (14:32 -0600)

Trivial merge