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

[John Ralls <jralls src gnome org>]

commit a18039d03a37efb127e02499754fb10f11d4e316
Merge: b1339b3 66d4f07
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jan 29 10:13:35 2011 -0800

    Merge branch 'master' into quartz-integration

 gtk/gtkentry.c               |   13 +-
 gtk/gtkstyle.c               |   60 +-
 gtk/gtkstylecontext.c        |   50 +
 gtk/gtkstylecontextprivate.h |    3 +
 gtk/gtktextdisplay.c         |   11 +-
 gtk/gtkthemingengine.h       |    4 +-
 gtk/gtkwidget.c              |   65 +-
 gtk/gtkwidgetprivate.h       |    3 -
 po-properties/pa.po          | 2319 +++++----
 po/it.po                     | 2828 ++++------
 po/pa.po                     |12408 ++++++++++++++++--------------------------
 11 files changed, 7120 insertions(+), 10644 deletions(-)
---