sync cvs
Merge branch 'master' into consistent-hash
fix leak