Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Tue, 21 Feb 2012 19:19:45 +0000 (13:19 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Tue, 21 Feb 2012 19:19:45 +0000 (13:19 -0600)

Trivial merge