Merge branch 'charm' of charmgit:charm into charm
authoryanhua <yanhua@yanhua-Precision-T1600.(none)>
Sat, 13 Oct 2012 04:40:00 +0000 (23:40 -0500)
committeryanhua <yanhua@yanhua-Precision-T1600.(none)>
Sat, 13 Oct 2012 04:40:00 +0000 (23:40 -0500)

Trivial merge