[MERGE] allow 'import bzrlib.plugins.NAME'

[Alexander Belchenko]

Alexander Belchenko has voted +1 (conditional).
Status is now: Approved
Comment:
I think instead of unindenting the whole code in load_from_dirs(), 
load_from_zips() you could place

if 1:

instead of "for" statement.

In this case annotation of old lines stay the same.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C1170433325.6059.30.camel%40localhost.localdomain%3E