Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper08.(none)>
Tue, 16 Aug 2011 01:55:30 +0000 (18:55 -0700)
committerYanhua Sun <sun51@hopper08.(none)>
Tue, 16 Aug 2011 01:55:30 +0000 (18:55 -0700)

Trivial merge