Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper06.(none)>
Tue, 27 Dec 2011 06:32:28 +0000 (22:32 -0800)
committerYanhua Sun <sun51@hopper06.(none)>
Tue, 27 Dec 2011 06:32:28 +0000 (22:32 -0800)

Trivial merge