Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Wed, 30 Jan 2013 05:33:51 +0000 (23:33 -0600)
committerYanhua Sun <sun51@illinois.edu>
Wed, 30 Jan 2013 05:33:51 +0000 (23:33 -0600)

Trivial merge