Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Thu, 5 Apr 2012 17:51:09 +0000 (12:51 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Thu, 5 Apr 2012 17:51:09 +0000 (12:51 -0500)

Trivial merge