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

[John Ralls <jralls src gnome org>]

commit 177c658fe54a1235536aa68d4470310fe6f616c5
Merge: c05f415 3f1c95d
Author: John Ralls <jralls ceridwen us>
Date:   Wed Feb 9 23:21:27 2011 -0800

    Merge branch 'master' into quartz-integration

 configure.ac                          |    7 +-
 docs/reference/gdk/gdk-docs.sgml      |    8 +-
 docs/reference/gtk/gtk-docs.sgml      |    6 +-
 docs/reference/gtk/migrating-2to3.xml |    8 +-
 gdk/gdkcairo.c                        |  226 +++++++++++++++++----------------
 gdk/gdkcairo.h                        |   46 ++++----
 gdk/gdkcolor.c                        |  100 ++++++++-------
 gdk/gdkcolor.h                        |   32 +++--
 gdk/gdkpixbuf-drawable.c              |   94 +++++++-------
 gdk/gdkpixbuf.h                       |   23 ++--
 gdk/gdkrgba.c                         |   89 +++++++------
 gdk/gdkrgba.h                         |   17 +--
 gdk/gdkwindow.c                       |   12 +-
 gtk/gtkaccellabel.c                   |   44 +++---
 gtk/gtktextlayout.h                   |    4 +-
 gtk/gtkthemingengine.c                |  147 ++++++++++++++--------
 16 files changed, 468 insertions(+), 395 deletions(-)
---