Rev 1925: (mbp) merges from mailing list in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1925
revision-id: pqm at pqm.ubuntu.com-20060815134855-fa70bb4face93182
parent: pqm at pqm.ubuntu.com-20060815131500-a6ba92a17caa4aab
parent: mbp at sourcefrog.net-20060815131912-7bbc6d387bb32d16
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-15 14:48:55 +0100
message:
  (mbp) merges from mailing list
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/tests/test_setup.py     test_setup.py-20051208073730-4a59a6368c4efa04
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060815131912-7bbc6d387bb32d16
    parent: mbp at sourcefrog.net-20060815074047-cc8af161eeb0a463
    parent: pqm at pqm.ubuntu.com-20060815050217-d2df7c83d6c5eeca
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Tue 2006-08-15 23:19:12 +1000
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060815074047-cc8af161eeb0a463
    parent: mbp at sourcefrog.net-20060814100355-c6dea3659787ddde
    parent: bialix at ukr.net-20060811143804-3231e902f23f0299
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Tue 2006-08-15 17:40:47 +1000
    message:
      [merge] generate_docs.py fix
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060811143804-3231e902f23f0299
        parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Fri 2006-08-11 17:38:04 +0300
        message:
          generate_docs.py should be invoked with python interpreter for cross-platform compatibility
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060814100355-c6dea3659787ddde
    parent: mbp at sourcefrog.net-20060814041110-afce2c0833c52452
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Mon 2006-08-14 20:03:55 +1000
    message:
      Add tests for build/install targets