merged latest fixes from bzr.0.14 branch

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> This fixes already in our codebase, so I simply merge them from 0.14 branch to bzr.dev.
> Patch attached.
> I think this lies in category 'trivial fixes' so I did this without merge request.

Unfortunately, this is against policy.

Policy is that once bzr0.14 branches from bzr.dev, bzr.dev never does a
complete merge from it.

The divergence is maintained so that it is impossible to accidentally
pull bzr.dev into bzr0.14.

I think it's an unfortunate policy-- merging the changes in a release
branch into the development branch is an eminently reasonable thing to
do.  But it is policy, and until it changes, we should follow it.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFt+Np0F+nu1YWqI0RAuxWAJ9vXxTL/6TVn9E37tBSfcTvFj1YdwCfR0yG
FzJdatiy+siSmxIMVLnnUkY=
=97+R
-----END PGP SIGNATURE-----