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

[Aaron Bentley]

Aaron Bentley has voted +1.
Status is now: Semi-approved
Comment:
It doesn't hurt, but it's not a complete fix.  Someone will come along 
whose email address matches '\btwo\b' eventually.

A proper fix would be for the test suite to set the email address.

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