Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper02.(none)>
Tue, 9 Aug 2011 20:16:37 +0000 (13:16 -0700)
committerYanhua Sun <sun51@hopper02.(none)>
Tue, 9 Aug 2011 20:16:37 +0000 (13:16 -0700)

Trivial merge