Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Tue, 13 Mar 2012 07:25:18 +0000 (02:25 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Tue, 13 Mar 2012 07:25:18 +0000 (02:25 -0500)

Trivial merge