[gtk+/gtk-2-24-quartz: 4/4] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit 088c8f6d2228beb7f4ff7fd2a30d053a1968078e
Merge: 7caa0fd a2a85a1
Author: John Ralls <jralls ceridwen us>
Date:   Sat Aug 13 23:22:04 2011 -0700

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 gdk/quartz/gdkdrawable-quartz.c |   98 +++++++++++++++++++++++++--------------
 gdk/quartz/gdkevents-quartz.c   |   85 ++++++++++++++++++++++++----------
 gdk/quartz/gdkgc-quartz.c       |   11 +++-
 gdk/quartz/gdkglobals-quartz.c  |   17 +++++++
 gdk/quartz/gdkprivate-quartz.h  |    8 ++--
 gdk/quartz/gdkquartz.h          |   13 +++++
 6 files changed, 166 insertions(+), 66 deletions(-)
---