Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Sun, 1 Apr 2012 05:09:08 +0000 (00:09 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Sun, 1 Apr 2012 05:09:08 +0000 (00:09 -0500)

Trivial merge