Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper11.(none)>
Fri, 7 Oct 2011 21:15:26 +0000 (14:15 -0700)
committerYanhua Sun <sun51@hopper11.(none)>
Fri, 7 Oct 2011 21:15:26 +0000 (14:15 -0700)

Trivial merge