Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Tue, 3 Apr 2012 20:04:03 +0000 (15:04 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Tue, 3 Apr 2012 20:04:03 +0000 (15:04 -0500)

Trivial merge