Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Wed, 3 Feb 2010 20:25:40 +0000 (14:25 -0600)
committerIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Wed, 3 Feb 2010 20:25:40 +0000 (14:25 -0600)

Trivial merge