Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@flair.(none)>
Fri, 12 Feb 2010 22:49:34 +0000 (16:49 -0600)
committerGengbin Zheng <gzheng@flair.(none)>
Fri, 12 Feb 2010 22:49:34 +0000 (16:49 -0600)

Trivial merge