Rev 6207: Merge the fix for bug #819604 into trunk, resolve conflicts. in http://bazaar.launchpad.net/~jameinel/2.5-client-reconnect-819604

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/2.5-client-reconnect-819604

------------------------------------------------------------
revno: 6207 [merge]
revision-id: john at arbash-meinel.com-20111010145512-zuzpcmhyz34n0xjc
parent: pqm at pqm.ubuntu.com-20111010142604-n77hphh9k3lfn668
parent: john at arbash-meinel.com-20111010135351-vvx51g07dmgd0b5h
fixes bug: https://launchpad.net/bugs/819604
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-client-reconnect-819604
timestamp: Mon 2011-10-10 16:55:12 +0200
message:
  Merge the fix for bug #819604 into trunk, resolve conflicts.
modified:
  bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
  bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
  bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
  doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------

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