Merge branch 'minasFixes' into charm
authorMinas Charalambides <charala1@illinois.edu>
Mon, 31 May 2010 21:06:10 +0000 (16:06 -0500)
committerMinas Charalambides <charala1@illinois.edu>
Mon, 31 May 2010 21:06:10 +0000 (16:06 -0500)

Trivial merge