Merged bzr branches

I’ve merged the branch with Bruno’s patches into the one with the improved dialog. All future (and temporary ’till svn is err available again) work should be done in that branch.

(the diff of the merge can be found here, btw.)