Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@newskillz.(none)>
Mon, 15 Feb 2010 20:58:19 +0000 (14:58 -0600)
committerGengbin Zheng <gzheng@newskillz.(none)>
Mon, 15 Feb 2010 20:58:19 +0000 (14:58 -0600)

Trivial merge