Merge lp://staging/~bzr-core/ubuntu/oneiric/bzr/sru-2.4.2 into lp://staging/ubuntu/oneiric/bzr

.bzr-builddeb/default.conf (+1/-0)
Makefile (+2/-0)
bzr (+1/-1)
bzrlib/__init__.py (+1/-1)
bzrlib/_annotator_pyx.c (+140/-140)
bzrlib/_bencode_pyx.c (+231/-231)
bzrlib/_btree_serializer_pyx.c (+470/-470)
bzrlib/_chk_map_pyx.c (+260/-260)
bzrlib/_chunks_to_lines_pyx.c (+52/-52)
bzrlib/_dirstate_helpers_pyx.c (+5233/-5009)
bzrlib/_dirstate_helpers_pyx.pyx (+9/-6)
bzrlib/_groupcompress_pyx.c (+302/-302)
bzrlib/_knit_load_data_pyx.c (+115/-115)
bzrlib/_known_graph_pyx.c (+484/-484)
bzrlib/_readdir_pyx.c (+132/-132)
bzrlib/_rio_pyx.c (+119/-119)
bzrlib/_simple_set_pyx.c (+245/-245)
bzrlib/_simple_set_pyx.h (+1/-1)
bzrlib/branch.py (+2/-1)
bzrlib/builtins.py (+44/-7)
bzrlib/config.py (+44/-19)
bzrlib/diff-delta.c (+5/-0)
bzrlib/dirstate.py (+3/-2)
bzrlib/help_topics/__init__.py (+1/-2)
bzrlib/i18n.py (+5/-1)
bzrlib/osutils.py (+17/-2)
bzrlib/plugins/launchpad/__init__.py (+1/-1)
bzrlib/remote.py (+2/-1)
bzrlib/repository.py (+4/-0)
bzrlib/smart/repository.py (+1/-1)
bzrlib/tests/__init__.py (+10/-1)
bzrlib/tests/blackbox/test_branch.py (+14/-4)
bzrlib/tests/per_repository_reference/__init__.py (+28/-9)
bzrlib/tests/stub_sftp.py (+2/-2)
bzrlib/tests/test__dirstate_helpers.py (+53/-0)
bzrlib/tests/test_config.py (+73/-8)
bzrlib/tests/test_i18n.py (+15/-2)
bzrlib/tests/test_osutils.py (+10/-0)
bzrlib/tests/test_repository.py (+8/-0)
bzrlib/tests/test_selftest.py (+16/-9)
bzrlib/tests/test_server.py (+3/-2)
bzrlib/tests/test_test_server.py (+55/-19)
bzrlib/transport/__init__.py (+1/-1)
bzrlib/transport/http/_pycurl.py (+7/-5)
bzrlib/transport/local.py (+1/-1)
bzrlib/urlutils.py (+2/-3)
bzrlib/version.py (+1/-1)
bzrlib/vf_repository.py (+3/-1)
debian/changelog (+24/-0)
debian/patches/01_selftest_package (+5/-5)
debian/patches/04_fix_i18n (+0/-61)
debian/patches/10_testtools_compatibility (+0/-319)
debian/patches/11_localhost_locks (+22/-0)
debian/patches/series (+1/-2)
doc/en/admin-guide/simple-setups.txt (+4/-4)
doc/en/mini-tutorial/index.txt (+61/-38)
doc/en/release-notes/bzr-2.0.txt (+3/-0)
doc/en/release-notes/bzr-2.1.txt (+24/-0)
doc/en/release-notes/bzr-2.2.txt (+40/-14)
doc/en/release-notes/bzr-2.3.txt (+5/-0)
doc/en/release-notes/bzr-2.4.txt (+156/-0)
doc/en/whats-new/whats-new-in-2.2.txt (+3/-0)
doc/en/whats-new/whats-new-in-2.4.txt (+9/-0)
setup.py (+1/-1)