Merge branch 'charm' of charmgit:charm into charm
authorIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Tue, 26 Jan 2010 16:01:29 +0000 (10:01 -0600)
committerIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Tue, 26 Jan 2010 16:01:29 +0000 (10:01 -0600)

Trivial merge