Rev 1469: [merge] robert in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1469
revision-id: mbp at sourcefrog.net-20051205070710-70afd75c420d1901
parent: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
parent: robertc at robertcollins.net-20051202032347-ba08123207a945a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-05 18:07:10 +1100
message:
  [merge] robert
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051202032347-ba08123207a945a0
    parent: robertc at robertcollins.net-20051129232031-916cdaefe3a3c19b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2005-12-02 14:23:47 +1100
    message:
      Test for Jeff Bailey.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051129232031-916cdaefe3a3c19b
    parent: robertc at robertcollins.net-20051129224327-ea254360b6b77a3a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-11-30 10:20:31 +1100
    message:
          * bzrlib.plugin.all_plugins has been changed from an attribute to a 
            query method. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051129224327-ea254360b6b77a3a
    parent: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-11-30 09:43:27 +1100
    message:
          * Plugins with the same name in different directories in the bzr plugin
            path are no longer loaded: only the first successfully loaded one is
            used. (Robert Collins)
      
          * bzrlib.plugin.all_plugins has been removed, instead look in
            bzrlib.plugins. (Robert Collins)