Merge algorithms

[Eli Zaretskii]

> Date: Fri, 17 Sep 2010 19:31:03 +1000
> From: Andrew Bennetts <andrew.bennetts at canonical.com>
> Cc: "Stephen J. Turnbull" <stephen at xemacs.org>, mbp at canonical.com,
> 	bazaar at lists.canonical.com
> 
> I *might* look doing this myself next week if no-one has done it first,
> and I haven't forgotten over the weekend...

Thanks.  That's much sooner than I'd consider doing it myself.  Let me
know if you need a reminder ;-)