Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper04.(none)>
Thu, 24 Oct 2013 21:39:40 +0000 (14:39 -0700)
committerYanhua Sun <sun51@hopper04.(none)>
Thu, 24 Oct 2013 21:39:40 +0000 (14:39 -0700)

Trivial merge