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

[John Ralls <jralls src gnome org>]

commit e244e8fe8f10c55dfa2e3d5b33f1754865bbd494
Merge: 273ab98 9186f06
Author: John Ralls <jralls ceridwen us>
Date:   Mon Aug 22 23:21:28 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                     |    2 +-
 gdk/wayland/gdkwindow-wayland.c  |    2 +
 gtk/gtkliststore.c               |    5 +-
 gtk/gtktreemodel.c               |   44 +-
 gtk/gtktreemodelfilter.c         | 2427 +++++++++++++++----------
 gtk/gtktreemodelsort.c           | 1046 ++++++-----
 gtk/gtktreestore.c               |   10 +-
 gtk/tests/Makefile.am            |   14 +-
 gtk/tests/filtermodel.c          | 3510 +++++++++++++++++++++++++++++------
 gtk/tests/gtktreemodelrefcount.c |  286 +++
 gtk/tests/gtktreemodelrefcount.h |  134 ++
 gtk/tests/liststore.c            |   85 +-
 gtk/tests/modelrefcount.c        |  978 ++++++++++
 gtk/tests/sortmodel.c            | 1151 ++++++++++++
 gtk/tests/treemodel.c            |  347 ++++
 gtk/tests/treemodel.h            |   60 +
 gtk/tests/treestore.c            |  117 +-
 po-properties/id.po              | 3818 +++++++++++++++++++-------------------
 tests/widget-factory.ui          |    3 +
 19 files changed, 10050 insertions(+), 3989 deletions(-)
---