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

[John Ralls <jralls src gnome org>]

commit b3c2d130b9b792a6d203b919aaca8c5f4fb18888
Merge: 43792f5 92e1d27
Author: John Ralls <jralls ceridwen us>
Date:   Sat Aug 6 23:21:17 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkstyleproperty.c                           |    3 +-
 modules/printbackends/cups/gtkcupsutils.c        |   78 +++++++++++++---------
 modules/printbackends/cups/gtkcupsutils.h        |    4 +-
 modules/printbackends/cups/gtkprintbackendcups.c |   26 ++++++--
 4 files changed, 72 insertions(+), 39 deletions(-)
---