Merge branch 'charm' of charmgit:charm into charm
authorDavid Kunzman <kunzman2@illinois.edu>
Wed, 26 Jan 2011 20:22:55 +0000 (14:22 -0600)
committerDavid Kunzman <kunzman2@illinois.edu>
Wed, 26 Jan 2011 20:22:55 +0000 (14:22 -0600)

Trivial merge