Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Fri, 11 May 2012 05:11:30 +0000 (00:11 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Fri, 11 May 2012 05:11:30 +0000 (00:11 -0500)

Trivial merge