Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@justice.(none)>
Sat, 13 Feb 2010 03:43:09 +0000 (21:43 -0600)
committerGengbin Zheng <gzheng@justice.(none)>
Sat, 13 Feb 2010 03:43:09 +0000 (21:43 -0600)

Trivial merge