Rev 1442: merge from Martin. in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1442
revision-id: robertc at robertcollins.net-20060109051935-ee3847274413fe22
parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-01-09 16:19:35 +1100
message:
  merge from Martin.
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  tutorial.txt                   tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    parent: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
    parent: mbp at sourcefrog.net-20060106121804-effcf89487f01864
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 12:51:38 +1100
    message:
      [merge] Move in tutorial text from wiki.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060106121804-effcf89487f01864
    parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-06 23:18:04 +1100
    message:
      Move in tutorial text from wiki.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
    parent: mbp at sourcefrog.net-20060105090132-968677325eab0148
    parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-06 12:13:05 +1100
    message:
      [merge] robertc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060105090132-968677325eab0148
    parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-05 20:01:32 +1100
    message:
      todo idea from John
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
    parent: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 10:35:27 +1100
    message:
      Prepare for 0.7rc1 release
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
    parent: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 10:34:14 +1100
    message:
      ignore .sw[nop] by default
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
    parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 09:39:56 +1100
    message:
      Don't ignore Makefile.in by default (#6413)