[gtk+/native-layout: 4/4] Merge branch 'master' into native-layout

[Tristan Van Berkom <tvb src gnome org>]

commit a564e69e51a2560945c163bf52dfa52702757e48
Merge: 84e2a85 1564d89
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Wed Jun 30 10:02:19 2010 -0400

    Merge branch 'master' into native-layout

 gdk/quartz/GdkQuartzWindow.c   |  103 ++++++++++++++++++++++++----------------
 gdk/quartz/gdkdnd-quartz.c     |   53 ++++++++++++++++++++
 gdk/quartz/gdkprivate-quartz.h |    1 +
 gdk/quartz/gdkwindow-quartz.c  |    4 +-
 4 files changed, 118 insertions(+), 43 deletions(-)
---