Merge branch 'charm' of charmgit:charm into charm
authorAbhinav S Bhatele <bhatele@login3.surveyor.alcf.anl.gov>
Sun, 16 May 2010 05:53:40 +0000 (00:53 -0500)
committerAbhinav S Bhatele <bhatele@login3.surveyor.alcf.anl.gov>
Sun, 16 May 2010 05:53:40 +0000 (00:53 -0500)

Trivial merge