Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <suny@arthur-login1.ccs.ornl.gov>
Thu, 28 Jul 2011 15:24:56 +0000 (11:24 -0400)
committerYanhua Sun <suny@arthur-login1.ccs.ornl.gov>
Thu, 28 Jul 2011 15:24:56 +0000 (11:24 -0400)

Trivial merge