Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@justice.(none)>
Thu, 11 Feb 2010 17:29:24 +0000 (11:29 -0600)
committerGengbin Zheng <gzheng@justice.(none)>
Thu, 11 Feb 2010 17:29:24 +0000 (11:29 -0600)

Trivial merge