Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Fri, 18 Dec 2009 21:10:05 +0000 (15:10 -0600)
committerIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Fri, 18 Dec 2009 21:10:05 +0000 (15:10 -0600)

Trivial merge