Neil Williams' QOF Book Merge Patch #2.

[Derek Atkins]

Log Message:
-----------
Neil Williams' QOF Book Merge Patch #2.

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/src/engine:
        Account.c
        Account.h
        qof_book_merge.c
        qof_book_merge.h
    gnucash/src/gnome:
        druid-hierarchy.c
        druid-merge.c
        druid-merge.h