Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Tue, 26 Jan 2010 17:44:52 +0000 (11:44 -0600)
committerIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Tue, 26 Jan 2010 17:44:52 +0000 (11:44 -0600)

Trivial merge