~bzr-pqm/bzr/bzr.dev

Merge fix for bug #388269 into trunk, resolve conflicts and add release notes.
Filename Latest Rev Last Changed Committer Comment Size
..