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

[John Ralls <jralls src gnome org>]

commit c5b647e4af47f41b12450f7fa1c0082384132284
Merge: d2fda4c 342754e
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jun 9 23:21:11 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                                     |   22 +
 docs/reference/gtk/gtk3-sections.txt             |    1 +
 gtk/Makefile.am                                  |    1 +
 gtk/gtk.symbols                                  |    2 +
 gtk/gtkborderimage.c                             |   63 +-
 gtk/gtkborderimageprivate.h                      |    2 +
 gtk/gtkcellrendererpixbuf.c                      |  173 +-
 gtk/gtkcssprovider.c                             |   10 +-
 gtk/gtkcssprovider.h                             |    2 +-
 gtk/gtkcustompaperunixdialog.c                   |    3 +-
 gtk/gtkdialog.c                                  |    3 +
 gtk/gtkentry.c                                   |  128 +-
 gtk/gtkimage.c                                   |  337 +--
 gtk/gtkprinteroption.c                           |   64 +
 gtk/gtkshadow.c                                  |   48 +
 gtk/gtkshadowprivate.h                           |    8 +
 gtk/gtkspinbutton.c                              |    6 -
 gtk/gtkstylecontext.c                            |   41 +
 gtk/gtkstylecontext.h                            |   12 +
 gtk/gtkstyleproperty.c                           |   41 +-
 gtk/gtkthemingengine.c                           |  278 ++-
 gtk/gtkthemingengine.h                           |    8 +-
 gtk/gtkthemingengineprivate.h                    |   30 +
 gtk/gtktreeview.c                                |   33 +-
 gtk/gtktreeviewcolumn.c                          |   50 +-
 gtk/gtktreeviewcolumn.h                          |    1 +
 modules/printbackends/cups/Makefile.am           |    2 +
 modules/printbackends/cups/gtkprintbackendcups.c |   75 +-
 modules/printbackends/cups/gtkprintercups.c      |  404 +++-
 modules/printbackends/cups/gtkprintercups.h      |   23 +-
 po-properties/he.po                              | 1400 +++++-----
 po-properties/nb.po                              | 3361 +++++++++++-----------
 po/es.po                                         |  729 +++---
 po/he.po                                         |  703 +++---
 34 files changed, 4518 insertions(+), 3546 deletions(-)
---