Rev 212: Bad merge fixes. in /home/robertc/source/baz/plugins/bzrtools/storage/

[Robert Collins]

------------------------------------------------------------
revno: 212
revision-id: robertc at robertcollins.net-20060125044955-38fb77066b39b70c
parent: robertc at robertcollins.net-20060125044221-f5e442cfe06ebb88
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 15:49:55 +1100
message:
  Bad merge fixes.
modified:
  blackbox.py                    blackbox.py-20051024040435-607c5e197ca2b9d8
  fetch_ghosts.py                fetch_missing.py-20050903220502-5529ef03979a5b29