Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 17 Oct 2012 22:16:19 +0000 (17:16 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 17 Oct 2012 22:16:19 +0000 (17:16 -0500)

Trivial merge