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

[John Ralls <jralls src gnome org>]

commit 5aaf5ce7132175e1f7bc7fcd21eda06a21f5412f
Merge: 3fc08e9 dca9db1
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jul 30 23:21:27 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/quartz/gdkdevice-core-quartz.c |    6 ++++--
 gdk/quartz/gdkevents-quartz.c      |   18 ++++++++++++------
 gdk/quartz/gdkprivate-quartz.h     |    4 +++-
 gdk/quartz/gdkwindow-quartz.c      |    3 ++-
 gtk/gtktreeview.c                  |    2 --
 5 files changed, 21 insertions(+), 12 deletions(-)
---