Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Mon, 12 Mar 2012 20:37:24 +0000 (15:37 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Mon, 12 Mar 2012 20:37:24 +0000 (15:37 -0500)

Trivial merge