Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Thu, 18 Apr 2013 20:07:46 +0000 (20:07 +0000)
committerYanhua Sun <sun51@illinois.edu>
Thu, 18 Apr 2013 20:07:46 +0000 (20:07 +0000)

Trivial merge