Merge branch 'charm' of charmgit:charm into charm
authorJonathan Lifflander <jliffl2@illinois.edu>
Mon, 2 Aug 2010 17:05:39 +0000 (12:05 -0500)
committerJonathan Lifflander <jliffl2@illinois.edu>
Mon, 2 Aug 2010 17:05:39 +0000 (12:05 -0500)

Trivial merge