[MERGE] really get push working with less lock churn

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1239774570.2892.490.camel%40lifeless-64%3E
Project: Bazaar