[patch][bugfix] Merge deletes foo.new

[Aaron Bentley]

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

Erik Bågfors wrote:
> NP, thanks for looking into it so quickly! You guys rock.

Aw, thanks.  Here's the patch.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD0Rmo0F+nu1YWqI0RAsazAJ9tTfTczvMOYU0mfnZuQeS8ThoB+wCfTVID
0V+bdGpM+B6moe4VfsZpwu8=
=DBvE
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: filename-new.patch
Type: text/x-patch
Size: 2852 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060120/644f94b8/attachment.bin