Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei09@gmail.com>
Thu, 18 Feb 2010 00:54:46 +0000 (18:54 -0600)
committerChao Mei <chaomei09@gmail.com>
Thu, 18 Feb 2010 00:54:46 +0000 (18:54 -0600)

Trivial merge