Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <suny@jaguarpf-login7.ccs.ornl.gov>
Fri, 20 Apr 2012 20:16:53 +0000 (16:16 -0400)
committerYanhua Sun <suny@jaguarpf-login7.ccs.ornl.gov>
Fri, 20 Apr 2012 20:16:53 +0000 (16:16 -0400)

Trivial merge