[glom: 2/2] Fixed merge

[Murray Cumming <murrayc src gnome org>]

commit 40adedadab67a3e732c5104919d4014add40228b
Merge: a738b68... c7167ac...
Author: Murray Cumming <murrayc openismus com>
Date:   Fri Nov 6 14:31:00 2009 +0100

    Fixed merge

 ChangeLog        |    6 ++++++
 Makefile_glom.am |    4 +---
 configure.ac     |   16 ++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --cc ChangeLog
index 510efc6,8a3caca..ea5319e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,9 +1,17 @@@
 +2009-11-06  Murray Cumming  <murrayc murrayc com>
 +
 +	Fix a crash when specifying a static image on the layout.
 +
 +	* glom/utility_widgets/imageglom.cc: on_menupopup_activate_select_file():
 +	Check for a null parent window pointer to avoid a crash, fixing bug 
 +	#600954 (Michael Hasselmann).
 +
+ 2009-11-06  David King  <davidk openismus com>
+ 
+ 	* configure.ac:
+ 	* Makefile_glom.am: Do not link to libgettextpo on Maemo, and
+ 	additionally do not check for it either.
+ 
  2009-11-04  David King  <davidk openismus com>
  
  	* glom.xml: Add Maemo-specific category for classification of .glom