Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper07.(none)>
Thu, 20 Oct 2011 02:35:03 +0000 (19:35 -0700)
committerYanhua Sun <sun51@hopper07.(none)>
Thu, 20 Oct 2011 02:35:03 +0000 (19:35 -0700)

Trivial merge