Rev 5017: (vila) Merge 2.1 branch including fix for #516183) and fix NEWS in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5017 [merge]
revision-id: pqm at pqm.ubuntu.com-20100209142113-o8yqxlo2kqgp98q0
parent: pqm at pqm.ubuntu.com-20100208120624-zqc1nk5x9hltgmiu
parent: v.ladeuil+lp at free.fr-20100209134241-uz4wd2unj20v4w22
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-02-09 14:21:13 +0000
message:
  (vila) Merge 2.1 branch including fix for #516183) and fix NEWS
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe

Diff too large for email (1157 lines, the limit is 1000).