Merge branch 'charm' of charmgit:charm into charm
authorAbhinav S Bhatele <bhatele@login2.surveyor.alcf.anl.gov>
Wed, 2 Feb 2011 23:35:38 +0000 (23:35 +0000)
committerAbhinav S Bhatele <bhatele@login2.surveyor.alcf.anl.gov>
Wed, 2 Feb 2011 23:35:38 +0000 (23:35 +0000)

Trivial merge