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

[John Ralls <jralls src gnome org>]

commit d1b50518694deba3240113b7a0a7f0343f78f421
Merge: 157b1d7 2ebe1ef
Author: John Ralls <jralls ceridwen us>
Date:   Mon May 23 23:21:07 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkcssprovider.c                       |    6 ++----
 gtk/gtkfilechooserdefault.c                |    3 ++-
 gtk/gtkwindow.c                            |    2 +-
 tests/css/parser/Makefile.am               |    3 ++-
 tests/css/parser/widget-style-property.css |    3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)
---