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

[John Ralls <jralls src gnome org>]

commit de879f5e4faa398d3c65e952926b3b9260036dda
Merge: 4cac1b6 8d69f3d
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jul 26 06:52:21 2011 -0700

    Merge branch 'master' into quartz-integration
    
    Conflicts:
    	gdk/quartz/gdkwindow-quartz.c

 gtk/gtkclipboard-quartz.c |    7 ++++---
 tests/widget-factory.c    |   24 +++++++++++++++++++-----
 tests/widget-factory.ui   |   19 +++++++++++++++++--
 3 files changed, 40 insertions(+), 10 deletions(-)
---