[MERGE][0.90][0.91][Bug 137044] ftp password handling broken

[Aaron Bentley]

Aaron Bentley has voted tweak.
Status is now: Conditionally approved
Comment:
The fix looks fine.

You have a bunch of long lines using \ as a continuation marker.  The 
preferred way of wrapping those is using parentheses around them.

You have also converted "from bzrlib import tests" to "from bzrlib.tests 
import ...", which is the opposite of the way we're generally trying to 
go.  "from package import module" is compatible with lazy_import.  "from 
packages.module import class" is not.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Cm2r6ldsg63.fsf%40free.fr%3E