Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@justice.(none)>
Sat, 20 Feb 2010 04:10:15 +0000 (22:10 -0600)
committerGengbin Zheng <gzheng@justice.(none)>
Sat, 20 Feb 2010 04:10:15 +0000 (22:10 -0600)

Trivial merge