Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper05.(none)>
Mon, 27 Feb 2012 02:36:49 +0000 (18:36 -0800)
committerYanhua Sun <sun51@hopper05.(none)>
Mon, 27 Feb 2012 02:36:49 +0000 (18:36 -0800)

Trivial merge