Merge branch 'charm' of charmgit:charm into charm
authorEdgar Solomonik <solomon@cetuslac1.i2b.alcf.anl.gov>
Tue, 15 May 2012 22:43:23 +0000 (22:43 +0000)
committerEdgar Solomonik <solomon@cetuslac1.i2b.alcf.anl.gov>
Tue, 15 May 2012 22:43:23 +0000 (22:43 +0000)

Trivial merge