Merge branch 'charm' of charmgit:charm into charm
authorMinas Charalambides <charala1@illinois.edu>
Wed, 2 Jun 2010 20:11:47 +0000 (15:11 -0500)
committerMinas Charalambides <charala1@illinois.edu>
Wed, 2 Jun 2010 20:11:47 +0000 (15:11 -0500)

Trivial merge