Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <suny@jaguarpf-login8.ccs.ornl.gov>
Tue, 17 Apr 2012 20:45:03 +0000 (16:45 -0400)
committerYanhua Sun <suny@jaguarpf-login8.ccs.ornl.gov>
Tue, 17 Apr 2012 20:45:03 +0000 (16:45 -0400)

Trivial merge