Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Wed, 8 Feb 2012 00:24:33 +0000 (18:24 -0600)
committerEric Bohm <ebohm@illinois.edu>
Wed, 8 Feb 2012 00:24:33 +0000 (18:24 -0600)

Trivial merge