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

[John Ralls <jralls src gnome org>]

commit f3fe6a9d448873bdbcf86916f1f86940a939802f
Merge: 29e0318 a3b3c91
Author: John Ralls <jralls ceridwen us>
Date:   Sun Mar 6 23:21:09 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkdevicemanager-xi2.c |    9 +
 gtk/gtknotebook.c              |   82 +-
 gtk/gtkstylecontext.c          |    6 +-
 po-properties/eo.po            | 5186 ++++++++++++++++++++++------------------
 po-properties/pt.po            |  264 ++-
 po/es.po                       |  146 +-
 6 files changed, 3145 insertions(+), 2548 deletions(-)
---