Merge branch 'charm' of charmgit:charm into charm
authorYanhua YanhuaSunLaptop <yanhuasun@vpn3-14718.near.uiuc.edu>
Tue, 23 Mar 2010 20:54:01 +0000 (15:54 -0500)
committerYanhua YanhuaSunLaptop <yanhuasun@vpn3-14718.near.uiuc.edu>
Tue, 23 Mar 2010 20:54:01 +0000 (15:54 -0500)

Trivial merge