Rev 1424: Merge from mbp. in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1424
revision-id: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
parent: robertc at robertcollins.net-20051206082223-46591e053716a9ce
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 14:08:32 +1100
message:
  Merge from mbp.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
    parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-06 17:53:25 +1100
    message:
      News entries for recent merge from John.