Merge branch 'charm' of charmgit:charm into charm
authorMinas Charalambides <charala1@illinois.edu>
Mon, 20 Sep 2010 19:05:30 +0000 (14:05 -0500)
committerMinas Charalambides <charala1@illinois.edu>
Mon, 20 Sep 2010 19:05:30 +0000 (14:05 -0500)

Trivial merge