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

[John Ralls <jralls src gnome org>]

commit 3544cf1488ed1cbcb12bc515c1724e8f048cf10f
Merge: 7328179 2f207ca
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jan 16 23:21:11 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkdevicemanager-xi2.c |    4 +-
 gtk/gtkcellarea.c              |    1 +
 gtk/gtkcssprovider.c           |    5 +
 gtk/gtkentry.c                 |    5 +
 gtk/gtkframe.c                 |   18 +
 gtk/gtkmodifierstyle.c         |   10 +-
 gtk/gtkspinbutton.c            |    5 -
 gtk/gtkstyle.c                 |    7 +
 gtk/gtkstylecontext.c          |    4 +
 gtk/gtkstyleproperties.c       |   20 +-
 gtk/gtkwidget.c                |   18 +-
 po-properties/es.po            | 3260 +++++++++++++++++++++++-----------------
 po-properties/et.po            |  109 +-
 po-properties/gl.po            |  372 +++---
 po/es.po                       |  240 ++--
 po/et.po                       |   14 +-
 po/gl.po                       |  223 ++--
 17 files changed, 2414 insertions(+), 1901 deletions(-)
---