merged latest fixes from bzr.0.14 branch

[Alexander Belchenko]

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

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.

Alexander

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

iD8DBQFFt9kLzYr338mxwCURAiwNAKCEAi3Z1pEd+YqagjqMOwRC8Lg44gCeNWOp
LSEcymuWp8isQgyprQqDI1k=
=saJI
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: merge.bzr.0.14.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070125/6be4d3ed/attachment-0001.diff