Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper05.(none)>
Wed, 15 Feb 2012 19:39:14 +0000 (11:39 -0800)
committerYanhua Sun <sun51@hopper05.(none)>
Wed, 15 Feb 2012 19:39:14 +0000 (11:39 -0800)

Trivial merge