Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <suny@jaguarpf-login1.ccs.ornl.gov>
Fri, 31 Aug 2012 20:04:32 +0000 (16:04 -0400)
committerYanhua Sun <suny@jaguarpf-login1.ccs.ornl.gov>
Fri, 31 Aug 2012 20:04:32 +0000 (16:04 -0400)

Trivial merge