Merge branch 'charm' of charmgit:charm into charm
authorYanhua YanhuaSunLaptop <yanhuasun@vpn3-145213.near.uiuc.edu>
Fri, 12 Mar 2010 18:55:37 +0000 (12:55 -0600)
committerYanhua YanhuaSunLaptop <yanhuasun@vpn3-145213.near.uiuc.edu>
Fri, 12 Mar 2010 18:55:37 +0000 (12:55 -0600)

Trivial merge