Code review comment for lp:~maxb/bzr-builddeb/bzrtools-code-disentangle

OK, sorry for that, I was so focussed on sorting out the congruence with upstream_import.py that I failed to spot the use of another bzrtools file.

This should now be ready for reconsideration, and this time I've taken care to purge bzrtools from my system before running the builddeb tests.