From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 12 Jan 2009 04:12:01 +0000
Subject: Merge revisions 36866:37046 from trunk.

svn path=/branches/kill-bonobo/; revision=37050
---
 widgets/ChangeLog | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'widgets/ChangeLog')

diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 296d3210d5..71810c617c 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,26 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* menus/gal-view-collection.c:
+	* menus/gal-view-instance.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #567276
+
+	* menus/gal-view-menus.c:
+	Remove unneeded #include <libgnomeui/gnome-dialog.h>.
+
+2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
+
+	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
+
+	* Fix for bug #566011
+
+	* misc/e-charset-picker.c:
+	* misc/e-signature-combo-box.c:
+	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.
+
 2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #559041
-- 
cgit v1.2.3