[gnome-panel/bonobo-less: 93/93] Merge remote branch 'origin/bonobo-less' into bonobo-less

[Vincent Untz <vuntz src gnome org>]

commit 8d3aacc8ebca0a7d0f3899fbeefc2e09364e8220
Merge: 73ffa70 4bfab5e
Author: Vincent Untz <vuntz gnome org>
Date:   Wed May 26 10:29:37 2010 +0200

    Merge remote branch 'origin/bonobo-less' into bonobo-less

 configure.in                                       |    2 +-
 .../panel-applet-container.c                       |    4 ++++
 gnome-panel/panel-shell.c                          |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc configure.in
index 4b47ac8,7e134d7..79ad0a4
--- a/configure.in
+++ b/configure.in
@@@ -57,8 -57,8 +57,8 @@@ AC_CHECK_FUNCS(_NSGetEnviron
  LIBGNOME_DESKTOP_REQUIRED=2.24.0
  GDK_PIXBUF_REQUIRED=2.7.1
  PANGO_REQUIRED=1.15.4
- GLIB_REQUIRED=2.25.5
+ GLIB_REQUIRED=2.25.7
 -GTK_REQUIRED=2.15.1
 +GTK_REQUIRED=2.19.7
  LIBWNCK_REQUIRED=2.19.5
  GCONF_REQUIRED=2.6.1
  LIBGNOME_MENU_REQUIRED=2.27.92