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

[John Ralls <jralls src gnome org>]

commit 7dc6eefd0e5685642096c01aeea025d036e4f8a1
Merge: a414169 0c16285
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jun 14 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkdevicemanager-xi2.c |    3 +-
 gtk/gtkimage.c                 |    2 +-
 gtk/gtkliststore.c             |   12 ++--
 gtk/gtkprinteroption.c         |    5 +-
 gtk/gtktexttag.c               |    1 +
 gtk/gtktextview.c              |    4 +-
 gtk/gtktoolbar.c               |    3 +-
 po/sl.po                       |   20 +++++-
 tests/Makefile.am              |    3 +
 tests/testclipboard.c          |  140 ++++++++++++++++++++++++++++++++++++++++
 tests/testgtk.c                |   14 ++--
 11 files changed, 184 insertions(+), 23 deletions(-)
---