> With these changes in place, OK to commit.

I've just pushed both patches.  Please have a look.

> To answer your previous question, this ‘wrap’ phase serves a different
> (but related) purpose than the ‘native-search-paths’ thing: it ensures
> that the ‘bzr’ program, when run by the user, finds all its Python
> modules.

I know.  But why do we need to use 'native-search-paths' to set
PYTHONPATH if we wrap all executables anyway?  What is the purpose of
'native-search-paths' in this case?