Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei09@gmail.com>
Fri, 19 Mar 2010 22:18:32 +0000 (17:18 -0500)
committerChao Mei <chaomei09@gmail.com>
Fri, 19 Mar 2010 22:18:32 +0000 (17:18 -0500)

Trivial merge