Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Fri, 17 Feb 2012 06:14:14 +0000 (00:14 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Fri, 17 Feb 2012 06:14:14 +0000 (00:14 -0600)

Trivial merge