Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun22@llnl.gov>
Mon, 12 Aug 2013 22:51:10 +0000 (15:51 -0700)
committerYanhua Sun <sun22@llnl.gov>
Mon, 12 Aug 2013 22:51:10 +0000 (15:51 -0700)

Trivial merge