Merge branch 'charm' of charmgit:charm into charm
authorMinas Charalambides <charala1@illinois.edu>
Fri, 4 Jun 2010 23:06:23 +0000 (18:06 -0500)
committerMinas Charalambides <charala1@illinois.edu>
Fri, 4 Jun 2010 23:06:23 +0000 (18:06 -0500)

Trivial merge