Merge branch 'charm' of charmgit:charm into charm
authorEhsan Totoni <totoni2@illinois.edu>
Thu, 12 May 2011 21:03:52 +0000 (16:03 -0500)
committerEhsan Totoni <totoni2@illinois.edu>
Thu, 12 May 2011 21:03:52 +0000 (16:03 -0500)

Trivial merge