[Success!] [MERGE] Less bazaar coding style regressions.

[Martin Pool]

So, while catching static code regressions is nice, this is causing
the problem I anticipated, which is that if you try to merge a branch
containing this test into a branch that has changes from before it was
present, those changes will be seen in the diff and cause the tests to
fail.

I guess those changes in the other branch have to be fixed
eventually...  But it'd be nice to fix them in batch in bzr trunk,
otherwise they'll keep cropping up randomly.

<https://bugs.edge.launchpad.net/bzr/+bug/317714>

Marius, could you change all the text to comply?

-- 
Martin <http://launchpad.net/~mbp/>