Neil Williams' QOF sync patch.

[Derek Atkins]

Log Message:
-----------
Neil Williams' QOF sync patch.

	* This patch updates the QOF merge code to current QOF to bring
	  the g2 branch into sync. This update also makes
	  qof_book_merge_param_as_string output strings that are
	  compatible with QSF: using false instead of FALSE in string
	  output and using the QSF_XSD_TIME for the datestrings. KVP
	  handling will be added in the next version.

Tags:
----
gnucash-gnome2-dev

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