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

[John Ralls <jralls src gnome org>]

commit 5097fb3555d637e5bf0702722564088482d6a822
Merge: 26b57dd 7e22b46
Author: John Ralls <jralls ceridwen us>
Date:   Tue Aug 9 23:21:28 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt |    1 +
 gtk/gtkcombobox.c                    |    4 ++++
 gtk/gtkentry.c                       |   21 ++++++++++++++-------
 gtk/gtkspinbutton.c                  |   34 +++++++++++++++++++++++-----------
 gtk/gtkstylecontext.c                |    1 +
 gtk/gtkstylecontext.h                |    9 +++++++++
 6 files changed, 52 insertions(+), 18 deletions(-)
---