Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Sun, 24 Jul 2011 16:57:19 +0000 (11:57 -0500)
committerYanhuaSun <sun51@illinois.edu>
Sun, 24 Jul 2011 16:57:19 +0000 (11:57 -0500)

Trivial merge