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

[John Ralls <jralls src gnome org>]

commit ba3303e4c127f33e3af82be5dfa8772035497218
Merge: 588a471 6f39855
Author: John Ralls <jralls ceridwen us>
Date:   Sat Aug 27 23:21:31 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkaboutdialog.c          |    3 +-
 gtk/gtkbutton.c               |    3 +-
 gtk/gtkcolorsel.c             |   33 ++--
 gtk/gtkcolorseldialog.h       |    1 -
 gtk/gtkcombobox.c             |    2 +-
 gtk/gtkdialog.c               |    2 +-
 gtk/gtkentrycompletion.c      |    2 +-
 gtk/gtkfilechooserdefault.c   |   30 +--
 gtk/gtkfontbutton.c           |    2 +-
 gtk/gtkfontchooser.c          |    6 +-
 gtk/gtkmenu.c                 |    2 +-
 gtk/gtkmenutoolbutton.c       |    3 +-
 gtk/gtkmessagedialog.c        |    3 +-
 gtk/gtkmountoperation.c       |   19 +-
 gtk/gtkpagesetupunixdialog.c  |  551 ++++++++++++++++++++---------------------
 gtk/gtkpathbar.c              |    2 +-
 gtk/gtkprinteroptionwidget.c  |   26 +--
 gtk/gtkprintunixdialog.c      |  324 +++++++++---------------
 gtk/gtkrecentchooserdefault.c |    3 +-
 gtk/gtkscalebutton.c          |    2 +-
 gtk/gtktoolbar.c              |    6 +-
 gtk/gtktoolbutton.c           |    3 +-
 gtk/gtktooltip.c              |    2 +-
 gtk/gtktreeview.c             |    3 +-
 gtk/gtktreeviewcolumn.c       |    2 +-
 gtk/tests/Makefile.am         |    2 +-
 26 files changed, 457 insertions(+), 580 deletions(-)
---