Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 25 Jan 2012 03:28:40 +0000 (21:28 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 25 Jan 2012 03:28:40 +0000 (21:28 -0600)

Trivial merge