[glom: 2/2] merged conflict

[Murray Cumming <murrayc src gnome org>]

commit 193d57fa26f62dd65a29cdcc41bb7e63210a7054
Merge: 495be5e... 032fea7...
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jun 28 11:49:14 2009 +0200

    merged conflict

 ChangeLog                                         |   14 +++++++++++++-
 ldtp/README                                       |    5 +++--
 ldtp/database-creation/create-db.py               |   21 +++++++++++++++++----
 ldtp/database-creation/postgres-central-empty.xml |    4 ++++
 ldtp/database-creation/postgres-self-empty.xml    |    4 ++++
 ldtp/database-creation/sqlite-empty.xml           |    4 ++++
 6 files changed, 45 insertions(+), 7 deletions(-)
---
diff --cc ChangeLog
index 4d42c16,6fb5a67..48639d3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,15 +1,23 @@@
- 2009-06-26  Murray Cumming  <murrayc murrayc com>
++2009-06-28  Murray Cumming  <murrayc murrayc com>
 +
 +	Fix an error check.
 +
 +	* glom/xsl_utils.cc: transform_and_open(): Fix the check for a failed 
 +	gtk_show_uri(), so we really check. Noticed while stealing this code 
 +	for vidrot.
 +
+ 2009-06-27  Armin Burgmeier  <armin openismus com>
+ 
+ 	* ldtp/database-creation/postgres-central-empty.xml:
+ 	* ldtp/database-creation/postgres-self-empty.xml:
+ 	* ldtp/database-creation/sqlite-empty.xml: Added missing files.
+ 
+ 	* ldtp/database-creation/create-db.py: Allow passing the datafilename
+ 	as an argument when the script is called directly, not by ldtprunner.
+ 
+ 	* ldtp/README: Updated the section on how to execute a single test
+ 	script.
+ 
  2009-06-26  Armin Burgmeier  <armin openismus com>
  
  	* glom/libglom/document/bakery/document.h: Document that failure_code