merged latest fixes from bzr.0.14 branch

[Alexander Belchenko]

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

Aaron Bentley пишет:
> 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.

I did not merge 0.14 completely, but with -r-2 flag, because we don't need
version info bump. So these branches still diverged.

> 
> 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.

I'm sorry.
I'm better *always* send merge request, even for trivial fixes.
So please excuse me.

- --
Alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFt+ixzYr338mxwCURAm/DAJ45qDXtF1L5eCFDiL1uNR7JmhTLrACggAua
fCgEuA68s94JCX+orvJr7v4=
=rTNB
-----END PGP SIGNATURE-----