Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper12.(none)>
Fri, 19 Oct 2012 16:39:15 +0000 (09:39 -0700)
committerYanhua Sun <sun51@hopper12.(none)>
Fri, 19 Oct 2012 16:39:15 +0000 (09:39 -0700)

Trivial merge