Rev 5970: (mbp) optionally detect and steal dead locks from the same machine and user in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5970 [merge]
revision-id: pqm at pqm.ubuntu.com-20110614080836-d06kod1br6j1rx6j
parent: pqm at pqm.ubuntu.com-20110613171813-m9y5n1n7vph64fsh
parent: mbp at canonical.com-20110613011322-2u2hc7gxpk2vwv47
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-06-14 08:08:36 +0000
message:
  (mbp) optionally detect and steal dead locks from the same machine and user
   (bug 220464) (Martin Pool)
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1

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