Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper07.(none)>
Thu, 27 Oct 2011 06:23:47 +0000 (23:23 -0700)
committerYanhua Sun <sun51@hopper07.(none)>
Thu, 27 Oct 2011 06:23:47 +0000 (23:23 -0700)

Trivial merge