Merge branch 'charm' of charmgit:charm into charm
authorJonathan Lifflander <jliffl2@illinois.edu>
Tue, 6 Jul 2010 01:42:33 +0000 (20:42 -0500)
committerJonathan Lifflander <jliffl2@illinois.edu>
Tue, 6 Jul 2010 01:42:33 +0000 (20:42 -0500)

Trivial merge