Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Tue, 14 Jun 2011 20:15:29 +0000 (15:15 -0500)
committerYanhuaSun <sun51@illinois.edu>
Tue, 14 Jun 2011 20:15:29 +0000 (15:15 -0500)

Trivial merge