Merge branch 'charm' of charmgit:charm into charm
authorYanhuaSun <sun51@illinois.edu>
Wed, 10 Oct 2012 16:04:09 +0000 (11:04 -0500)
committerYanhuaSun <sun51@illinois.edu>
Wed, 10 Oct 2012 16:04:09 +0000 (11:04 -0500)

Trivial merge