[gtk+/quartz-integration: 13/13] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit 2ef7aa027121c771995805bbbf3672211ed4b1b8
Merge: ca111a6 685fe29
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 6 23:21:07 2011 -0800

    Merge branch 'master' into quartz-integration

 configure.ac                                   |   74 +-
 docs/reference/gtk/gtk-query-immodules-3.0.xml |    2 +-
 docs/reference/gtk/tmpl/gtktextbuffer.sgml     |    2 +-
 gtk/Makefile.am                                |    4 +-
 gtk/gtkaccelgroup.c                            |   12 +-
 gtk/gtkadjustment.h                            |   60 +-
 gtk/gtkappchooserdialog.c                      |    4 +-
 gtk/gtkcellarea.c                              |   15 +-
 gtk/gtkcelllayout.c                            |    2 +-
 gtk/gtkcomboboxtext.c                          |    5 +-
 gtk/gtkfilechooser.c                           |    6 +-
 gtk/gtkmain.c                                  |    2 +-
 gtk/gtksettings.c                              |    4 +-
 gtk/gtksizegroup.c                             |    6 +-
 gtk/gtkthemingengine.c                         |    2 +-
 gtk/gtktoolshell.c                             |    2 +-
 gtk/gtktreemenu.c                              |   62 +-
 gtk/gtkwindow.c                                |   10 +-
 po-properties/gl.po                            | 3412 ++++++-----
 po/gl.po                                       |  969 ++--
 po/lg.po                                       | 8665 ++++++++++++------------
 21 files changed, 6880 insertions(+), 6440 deletions(-)
---