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

[John Ralls <jralls src gnome org>]

commit f726f33629cf759d15ac225083a8358561ea0ab7
Merge: 072d6ff 6c1133c
Author: John Ralls <jralls ceridwen us>
Date:   Thu May 5 23:21:18 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt     |    2 +
 gtk/gtk.symbols                          |    2 +
 gtk/gtkbbox.c                            |   92 ++++++++-
 gtk/gtkbbox.h                            |   16 ++-
 gtk/gtkicontheme.c                       |    9 +-
 gtk/gtklabel.c                           |    7 +-
 gtk/gtkstatusicon.c                      |   17 +-
 gtk/gtktrayicon-x11.c                    |   78 ++++----
 tests/reftests/Makefile.am               |   15 +-
 tests/reftests/alignment-props.css       |    8 +
 tests/reftests/alignment-props.ref.ui    |  181 +++++++++++++++++
 tests/reftests/alignment-props.ui        |  137 +++++++++++++
 tests/reftests/box-expand.css            |    3 +
 tests/reftests/box-expand.ref.ui         |  149 ++++++++++++++
 tests/reftests/box-expand.ui             |  163 ++++++++++++++++
 tests/reftests/box-packing.ref.ui        |   92 +++++++++-
 tests/reftests/box-packing.ui            |  311 +++++++++++++++++++++++++++---
 tests/reftests/grid-expand.css           |    3 +
 tests/reftests/grid-expand.ref.ui        |   67 +++++++
 tests/reftests/grid-expand.ui            |   81 ++++++++
 tests/reftests/gtk-reftest.c             |   37 ++++-
 tests/reftests/label-wrap-justify.ref.ui |   73 +++++++
 tests/reftests/label-wrap-justify.ui     |   78 ++++++++
 tests/reftests/misc-alignment.ref.ui     |  276 ++++++++++++++++++++++++++
 tests/reftests/misc-alignment.ui         |  304 +++++++++++++++++++++++++++++
 25 files changed, 2101 insertions(+), 100 deletions(-)
---