Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@bp-login1.(none)>
Sun, 6 Jun 2010 05:52:06 +0000 (00:52 -0500)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Sun, 6 Jun 2010 05:52:06 +0000 (00:52 -0500)
commit006f53caf72c110b0a51d65353adcdbe65bc00a4
treea08c914191df1a50fda5f6c9e95d1512b1b04e59
parentcae8a0384cf6d3f34b4ed62acba9f3401107e132
parentedbb8c092dc96527c8b9fad6f51eec7d90c609e2
Merge branch 'charm' of charmgit:charm into charm