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

[John Ralls <jralls src gnome org>]

commit f6cf252df6fc15ee5aa83241fc6b50b75916070d
Merge: a8e9746 7962a4b
Author: John Ralls <jralls ceridwen us>
Date:   Thu Apr 28 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkarrow.c      |   11 ++++++-----
 gtk/gtkliststore.c  |    4 ++--
 gtk/gtkpaned.c      |   11 ++++-------
 gtk/gtkscrollable.c |    8 ++++++++
 gtk/gtkwidget.c     |    6 ++++--
 gtk/gtkwindow.c     |    2 +-
 po/lg.po            |   12 ++++++------
 7 files changed, 31 insertions(+), 23 deletions(-)
---