Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <idooley2@illinois.edu>
Wed, 25 Aug 2010 21:46:24 +0000 (16:46 -0500)
committerIsaac Dooley <idooley2@illinois.edu>
Wed, 25 Aug 2010 21:46:24 +0000 (16:46 -0500)

Trivial merge