[merge] fix bundles with binary files

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I was able to get a test to fail if I put '\r' into the contents of a
binary file. I still don't really know why merging the .ico file worked
for me, but not for Alexander, but I can say the attached test fails if
you use 'string.splitlines(True)' instead of StringIO(string).readlines().

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEssC3JdeBCYSNAAMRAvFnAKCdV7wZJ4ge6TlAXKfvVqLWKho0RACg0Xux
+Hg0krL27tgkRCWusXlKoos=
=Tjva
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bundle-binaries.patch
Type: text/x-patch
Size: 3262 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060710/f65c68f0/attachment.bin