[MERGE] fix for bundle selftest fails when email has 'two' embedded

[John Arbash Meinel]

John Arbash Meinel has voted +1.
Status is now: Approved
Comment:
I'm not sure if there are other ways a regex could accidentally match 
(like if the revision_id happened to randomly generate those characters, 
though it should never match \btwo\b since that is only 3 characters 
long).

For determinism, though, it could certainly be better to have the test 
suite run with a known username and email. We could set it as part of 
creating the /home and /work directories. Though not all test cases use 
them. (TestCase doesn't, TestCaseInTempDir does).

The other possibility would be to set BZR_EMAIL rather than just 
clearing it as part of test setup. See _cleanEnvironment around line 
1013 in bzrlib/tests/__init__.py

Regardless, I would be okay with this patch.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C460B7EDC.4070006%40internode.on.net%3E