Comment 2 for bug 1052805

The appearance of the 'tests' directory throws off the heuristics in bzr-builddeb that make it assume the package is a merge or native package.

I've attached a branch that fixes this.