Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Fri, 12 Feb 2010 23:59:27 +0000 (17:59 -0600)
committerIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Fri, 12 Feb 2010 23:59:27 +0000 (17:59 -0600)

Trivial merge