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

[Ian Clatworthy]

Annoyance for me given my email address. :-(

Fix attached.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bundle-test-fix.patch
Type: text/x-patch
Size: 1284 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070329/d82b617c/attachment-0001.bin