Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Mon, 9 Apr 2012 04:56:56 +0000 (23:56 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Mon, 9 Apr 2012 04:56:56 +0000 (23:56 -0500)

Trivial merge