Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 19 Sep 2012 18:11:38 +0000 (13:11 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 19 Sep 2012 18:11:38 +0000 (13:11 -0500)

Trivial merge