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

[John Ralls <jralls src gnome org>]

commit 8ef5421f78cdfcab55da542bfd7366efab7a7d50
Merge: c358f1e d333911
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 20 23:21:07 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/Makefile.am          |    2 +
 gtk/gtkcssprovider.c     |   28 +++++
 gtk/gtkcssstringfuncs.c  |   72 ++++++++++++
 gtk/gtkshadow.c          |  284 ++++++++++++++++++++++++++++++++++++++++++++++
 gtk/gtkshadowprivate.h   |   64 +++++++++++
 gtk/gtkstyleproperties.c |   47 +++++++-
 gtk/gtkthemingengine.c   |   82 +++++++------
 7 files changed, 536 insertions(+), 43 deletions(-)
---