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

Trivial merge