[gtk+/gtk-2-24-quartz: 3/3] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit aa507513428f180308ae20a8ada04a8219815f79
Merge: 53e886b 55d11f8
Author: John Ralls <jralls ceridwen us>
Date:   Sat Aug 6 23:22:07 2011 -0700

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 modules/printbackends/cups/gtkcupsutils.c        |   78 +++++++++++++---------
 modules/printbackends/cups/gtkcupsutils.h        |    4 +-
 modules/printbackends/cups/gtkprintbackendcups.c |   26 ++++++--
 3 files changed, 70 insertions(+), 38 deletions(-)
---