Rev 5586: Merge trunk resolving conflicts in file:///home/vila/src/bzr/bugs/690563-better-env-isolation/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/690563-better-env-isolation/

------------------------------------------------------------
revno: 5586 [merge]
revision-id: v.ladeuil+lp at free.fr-20101216171739-v93fl6q2b83sm8nn
parent: v.ladeuil+lp at free.fr-20101216165807-qoef4qj07vpxy9bw
parent: pqm at pqm.ubuntu.com-20101216151517-qoslvcss5y1sivi6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-better-env-isolation
timestamp: Thu 2010-12-16 18:17:39 +0100
message:
  Merge trunk resolving conflicts
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
  doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-1
  doc/developers/check.txt       check.txt-20090506031430-9brd02w516phv8os-1
  doc/developers/code-style.txt  codestyle.txt-20100515105711-133ealf7ereiq2eq-1
  doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
  doc/developers/ec2.txt         ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
  doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
  doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
  doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
  doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
  doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
  doc/developers/transports.txt  transports.txt-20100716091505-sd18bmz2c3t8qold-1
  doc/developers/win32_build_setup.txt win32_build_setup.tx-20091104201959-pvlau2f8dndoxjj8-1
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/release-notes/bzr-0.1.txt bzr0.1.txt-20101008081016-21wd86gpfhllpue3-1
  doc/en/release-notes/bzr-0.11.txt bzr0.11.txt-20101008081016-21wd86gpfhllpue3-3
  doc/en/release-notes/bzr-0.13.txt bzr0.13.txt-20101008081016-21wd86gpfhllpue3-5
  doc/en/release-notes/bzr-0.14.txt bzr0.14.txt-20101008081016-21wd86gpfhllpue3-6
  doc/en/release-notes/bzr-0.15.txt bzr0.15.txt-20101008081016-21wd86gpfhllpue3-7
  doc/en/release-notes/bzr-0.16.txt bzr0.16.txt-20101008081016-21wd86gpfhllpue3-8
  doc/en/release-notes/bzr-0.18.txt bzr0.18.txt-20101008081016-21wd86gpfhllpue3-10
  doc/en/release-notes/bzr-0.6.txt bzr0.6.txt-20101008081016-21wd86gpfhllpue3-11
  doc/en/release-notes/bzr-0.7.txt bzr0.7.txt-20101008081016-21wd86gpfhllpue3-12
  doc/en/release-notes/bzr-0.8.txt bzr0.8.txt-20101008081016-21wd86gpfhllpue3-13
  doc/en/release-notes/bzr-0.9.txt bzr0.9.txt-20101008081016-21wd86gpfhllpue3-14
  doc/en/release-notes/bzr-0.90.txt bzr0.90.txt-20101008081016-21wd86gpfhllpue3-15
  doc/en/release-notes/bzr-0.91.txt bzr0.91.txt-20101008081016-21wd86gpfhllpue3-16
  doc/en/release-notes/bzr-0.92.txt bzr0.92.txt-20101008081016-21wd86gpfhllpue3-17
  doc/en/release-notes/bzr-1.0.txt bzr1.0.txt-20101008081016-21wd86gpfhllpue3-18
  doc/en/release-notes/bzr-1.1.txt bzr1.1.txt-20101008081016-21wd86gpfhllpue3-19
  doc/en/release-notes/bzr-1.11.txt bzr1.11.txt-20101008081016-21wd86gpfhllpue3-21
  doc/en/release-notes/bzr-1.12.txt bzr1.12.txt-20101008081016-21wd86gpfhllpue3-22
  doc/en/release-notes/bzr-1.13.txt bzr1.13.txt-20101008081016-21wd86gpfhllpue3-23
  doc/en/release-notes/bzr-1.15.txt bzr1.15.txt-20101008081016-21wd86gpfhllpue3-25
  doc/en/release-notes/bzr-1.16.txt bzr1.16.txt-20101008081016-21wd86gpfhllpue3-26
  doc/en/release-notes/bzr-1.17.txt bzr1.17.txt-20101008081016-21wd86gpfhllpue3-27
  doc/en/release-notes/bzr-1.18.txt bzr1.18.txt-20101008081016-21wd86gpfhllpue3-28
  doc/en/release-notes/bzr-1.2.txt bzr1.2.txt-20101008081016-21wd86gpfhllpue3-29
  doc/en/release-notes/bzr-1.3.txt bzr1.3.txt-20101008081016-21wd86gpfhllpue3-30
  doc/en/release-notes/bzr-1.4.txt bzr1.4.txt-20101008081016-21wd86gpfhllpue3-31
  doc/en/release-notes/bzr-1.5.txt bzr1.5.txt-20101008081016-21wd86gpfhllpue3-32
  doc/en/release-notes/bzr-1.6.txt bzr1.6.txt-20101008081016-21wd86gpfhllpue3-33
  doc/en/release-notes/bzr-1.7.txt bzr1.7.txt-20101008081016-21wd86gpfhllpue3-34
  doc/en/release-notes/bzr-1.8.txt bzr1.8.txt-20101008081016-21wd86gpfhllpue3-35
  doc/en/release-notes/bzr-1.9.txt bzr1.9.txt-20101008081016-21wd86gpfhllpue3-36
  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/tutorials/tutorial.txt  tutorial.txt-20050804190939-9dcbba2ef053bc84
  doc/en/upgrade-guide/data_migration.txt data_migration.txt-20090702082510-q2pocf7uhntljqnl-2
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
  doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
  doc/en/user-guide/organizing_your_workspace.txt organizing_your_work-20090226112520-bc2njq3kwvpeo814-1
  doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
  doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
  doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
  doc/ru/tutorials/tutorial.txt  tutorial.txt-20090602180629-wkp7wr27jl4i2zep-1
  doc/ru/user-guide/branching_a_project.txt branching_a_project.-20090602104644-pjpwfx7xh2k5l0ba-1
-------------- next part --------------

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