Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Thu, 1 Nov 2012 18:38:12 +0000 (13:38 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Thu, 1 Nov 2012 18:38:12 +0000 (13:38 -0500)

Trivial merge