Merge branch 'charm' of charmgit:charm into charm
authorLukasz Wesolowski <wesolwsk@talent.cs.uiuc.edu>
Wed, 3 Mar 2010 22:31:19 +0000 (16:31 -0600)
committerLukasz Wesolowski <wesolwsk@talent.cs.uiuc.edu>
Wed, 3 Mar 2010 22:31:19 +0000 (16:31 -0600)

Trivial merge