Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Sun, 8 Jul 2012 18:41:39 +0000 (13:41 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Sun, 8 Jul 2012 18:41:39 +0000 (13:41 -0500)

Trivial merge