Merge branch 'charm' of charmgit:charm into charm
authorEric Bohm <ebohm@illinois.edu>
Mon, 19 Mar 2012 14:32:40 +0000 (14:32 +0000)
committerEric Bohm <ebohm@illinois.edu>
Mon, 19 Mar 2012 14:32:40 +0000 (14:32 +0000)

Trivial merge