druid-merge, qof_book_merge and druid-hierarchy

[Derek Atkins]

Applied.

I should note that in the future could you reduce the amount of
white-space style changes in your patches?  I've applied this one
wholesale, but it's best if you try not to reformat existing code.

-derek

Neil Williams <linux at codehelp.co.uk> writes:

> Improvements to druid-merge and qof_book_merge. Includes and replaces my patch 
> to druid-hierarchy of Oct-22-04

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available