Merge branch 'charm' of charmgit:/charm into charm
authorEhsan Totoni <totoni2@illinois.edu>
Thu, 5 May 2011 22:17:21 +0000 (17:17 -0500)
committerEhsan Totoni <totoni2@illinois.edu>
Thu, 5 May 2011 22:17:21 +0000 (17:17 -0500)

Trivial merge