Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper09.(none)>
Thu, 15 Sep 2011 03:40:03 +0000 (20:40 -0700)
committerYanhua Sun <sun51@hopper09.(none)>
Thu, 15 Sep 2011 03:40:03 +0000 (20:40 -0700)

Trivial merge