Rev 1582: Trivial remerge fix in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1582
revision-id: pqm at pqm.ubuntu.com-20060310010444-ca8e101f47014c66
parent: pqm at pqm.ubuntu.com-20060310002657-2884f3b271336e36
parent: aaron.bentley at utoronto.ca-20060310001858-72b1a0a70172263c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-03-10 01:04:44 +0000
message:
  Trivial remerge fix
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060310001858-72b1a0a70172263c
    parent: abentley at panoramicfeedback.com-20060309213704-2aed92beb0d3259e
    parent: aaron.bentley at utoronto.ca-20060308071612-c2a4d6025ac7eff4
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-09 19:18:58 -0500
    message:
      Trivial remerge fix
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060308071612-c2a4d6025ac7eff4
    parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-03-08 02:16:12 -0500
    message:
      Stop using deprecated api in remerge