Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Fri, 27 Jul 2012 19:47:03 +0000 (14:47 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Fri, 27 Jul 2012 19:47:03 +0000 (14:47 -0500)

Trivial merge