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

[John Ralls <jralls src gnome org>]

commit dbbdc94fa521552cd4ee7a09162b1d0ba8dcecc8
Merge: c513ee6 6e1aa0e
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 17 23:21:09 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkdevicemanager-xi2.c  |   96 +-
 gtk/Makefile.am                 |    1 +
 gtk/gtkfilechooserdefault.c     |   13 +-
 gtk/gtknotebook.c               |    6 +
 gtk/gtkpaned.c                  |    1 -
 gtk/gtkstylecontext.c           |    1 +
 gtk/gtkstylecontext.h           |   14 +
 gtk/gtkstyleproperties.c        |    2 +-
 gtk/gtkstyleproperties.h        |    5 -
 gtk/gtkstylepropertiesprivate.h |   33 +
 gtk/gtktreeview.c               |   17 +-
 gtk/gtkwidget.c                 |   17 +-
 po-properties/POTFILES.in       |    4 +
 po-properties/de.po             | 4608 ++++++++++++++++++++++-----------------
 po-properties/en_GB.po          |  677 +++---
 15 files changed, 3099 insertions(+), 2396 deletions(-)
---