Merge branch 'charm' of charmgit:charm into charm
authorMinas Charalambides <charala1@illinois.edu>
Mon, 7 Jun 2010 07:18:28 +0000 (02:18 -0500)
committerMinas Charalambides <charala1@illinois.edu>
Mon, 7 Jun 2010 07:18:28 +0000 (02:18 -0500)

Trivial merge