Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Tue, 22 Feb 2011 21:56:41 +0000 (15:56 -0600)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Tue, 22 Feb 2011 21:56:41 +0000 (15:56 -0600)
commit7042e16daaff838e0d42b14a5fd01791c70a410b
tree582a1adfc31c823aafcdde5336ea440565afe6b1
parente8d1e4a091f799c7c509a06929bae082cc52e41b
parentec6d4135f975750df3eb3764f1f11a5527e97389
Merge branch 'charm' of charmgit:charm into charm