Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper11.(none)>
Wed, 2 Nov 2011 20:28:53 +0000 (13:28 -0700)
committerYanhua Sun <sun51@hopper11.(none)>
Wed, 2 Nov 2011 20:28:53 +0000 (13:28 -0700)

Trivial merge