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

[John Ralls <jralls src gnome org>]

commit 17c05a861e5c767c396dfa0c718f3efe2e4a0637
Merge: 7dc6eef e54ccae
Author: John Ralls <jralls ceridwen us>
Date:   Wed Jun 15 23:21:24 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkborderimage.c                     |    2 +
 gtk/gtkcssparser.c                       |    5 +-
 gtk/gtkcssprovider.c                     |   30 ++++
 gtk/gtkstylecontext.c                    |   30 +++-
 gtk/gtkstyleproperty.c                   |  245 +++++++++++++++++++++++++++++-
 gtk/gtkthemingengine.c                   |   21 ++-
 gtk/gtktoolbar.c                         |    4 +-
 tests/css/parser/Makefile.am             |    3 +
 tests/css/parser/font-family.css         |   65 ++++++++
 tests/css/parser/font-family.errors      |    8 +
 tests/css/parser/font-family.ref.css     |   27 ++++
 tests/reftests/background-area.css       |    6 +-
 tests/reftests/background-area.ref.ui    |    2 +-
 tests/reftests/background-area.ui        |    2 +-
 tests/reftests/box-shadow-spec-inset.css |    1 +
 15 files changed, 434 insertions(+), 17 deletions(-)
---