Rev 4578: NEWS Conflict. in http://people.canonical.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 4578 [merge]
revision-id: robertc at robertcollins.net-20090825234708-utgl9u6v12sosp5c
parent: robertc at robertcollins.net-20090825222819-j2goi0fgiuu894xu
parent: pqm at pqm.ubuntu.com-20090825233734-ozgeetbq9aagneer
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-08-26 09:47:08 +1000
message:
  NEWS Conflict.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
  bzrlib/shelf_ui.py             shelver.py-20081005210102-33worgzwrtdw0yrm-1
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_shelf.py     test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
  bzrlib/tests/test_shelf_ui.py  test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1

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