Better test for conflict between optimization and FORTIFY_SOURCE
Fix bad qof_instance crash in dialog-payments

Just needed one more level of indirection.
Thanks to Mike Alexander for the report.
Fix crash with libdib >= 0.9.0

Based on a patch provided by Colin Law
Merge branch 'maint'

* Mike Alexander's Better test for conflict between optimization and FORTIFY_SOURCE
* Fix crash with libdbi >= 0.9.0, based on a patch by Colin Law
Bug 729497 - Saved Report Configuration selection window resize
Revert "Fix crash with libdib >= 0.9.0"

This reverts commit 6695f6c6608869a2d4d62e94f060bf77b618d60c.
Fix crash initialising dbi if libdbi version >= 0.9.0
Merge branch 'maint'

* Proper fix for libdbi crash
* Saved report configuration dialog resize issues
Don't nest AC_MSG_CHECKING calls, it produces confuing output.
Merge branch 'maint'
Revert "Fix bad qof_instance crash in dialog-payments"

This reverts commit edd85faad75055231cc58779d2c677fc61cc9492.
Revert "Fix typo in test-engine-kvp-properties."

This reverts commit ac9a6ae606e67f8ca7a7fffd75a7f6c8dcc75060.
Revert "Merge branch 'private-kvp'"

This reverts commit f49983b8012197933c793fe94994ac5afa1d8d75, reversing
changes made to acad5a02bbc04cb17b33c89ed36d839416db8f10.
Merge branch 'private-kvp' into master again

This was done by branching right before the original merge
and redoing a clean merge of the private-kvp branch again.

This result was then cherry-picked onto master with
git cherry-pick <merge-commit> -m 1

It was done like this because git merge would consider
the private-kvp branch already merged even after a revert
(see git-revert man page) and won't allow to merge a
second time on the same branch.

Resolved conflicts:
	README.dependencies
	src/app-utils/gnc-sx-instance-model.c
	src/engine/cap-gains.c
	src/engine/test/Makefile.am
	src/gnome/assistant-hierarchy.c
	src/import-export/import-match-map.c
	src/import-export/import-utilities.c
	src/import-export/ofx/gnc-ofx-kvp.c
	src/libqof/qof/qofbook.cpp
	src/libqof/qof/qofinstance-p.h
	src/libqof/qof/qofinstance.cpp
	src/libqof/qof/test/test-kvp_frame.c
	src/report/report-gnome/gnc-plugin-page-report.c
Fixes necessary to marry private-kvp branch with c++ work
Reapply "Fix typo in test-engine-kvp-properties."

This reverts commit c475b9f8c7545e1f4dc3b1e0a3b9b6b217a30719.
Reapply "Fix bad qof_instance crash in dialog-payments"

This reverts commit b81289acc66340c74a4b7ed32d0dfffef4a87c16.
Update the XCode project for C++ changes
Better period totals formatting

This fixes formatting of period totals and makes it more informative and clear.

Also changes string "Payment, thank you" to just "Payment".
Merge branch 'maint'

* Owner report - better totals formatting, contributed by Amm