Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun22@llnl.gov>
Tue, 16 Jul 2013 17:47:41 +0000 (10:47 -0700)
committerYanhua Sun <sun22@llnl.gov>
Tue, 16 Jul 2013 17:47:41 +0000 (10:47 -0700)

Trivial merge