Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper05.(none)>
Fri, 2 Mar 2012 20:23:05 +0000 (12:23 -0800)
committerYanhua Sun <sun51@hopper05.(none)>
Fri, 2 Mar 2012 20:23:05 +0000 (12:23 -0800)

Trivial merge