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

[John Ralls <jralls src gnome org>]

commit 4d17feec927ff8790f77d5c64c27b3ccf210f808
Merge: 2de4086 3ace68e
Author: John Ralls <jralls ceridwen us>
Date:   Wed May 11 23:21:06 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/Makefile.am               |    6 +
 docs/reference/gtk/gtk-docs.sgml             |    1 +
 docs/reference/gtk/images/box-expand.png     |  Bin 0 -> 2372 bytes
 docs/reference/gtk/images/box-packing.png    |  Bin 0 -> 3561 bytes
 docs/reference/gtk/images/widget-hvalign.png |  Bin 0 -> 7323 bytes
 docs/reference/gtk/migrating-GtkGrid.xml     |  185 ++++++++++++++++++++++++++
 gtk/gtktreeview.c                            |    2 +-
 tests/reftests/Makefile.am                   |    9 +-
 tests/reftests/grid-spacing1.ref.ui          |  132 ++++++++++++++++++
 tests/reftests/grid-spacing1.ui              |  123 +++++++++++++++++
 tests/reftests/grid-spacing2.ref.ui          |  129 ++++++++++++++++++
 tests/reftests/grid-spacing2.ui              |  139 +++++++++++++++++++
 tests/reftests/grid-spacing3.css             |    8 +
 tests/reftests/grid-spacing3.ref.ui          |   76 +++++++++++
 tests/reftests/grid-spacing3.ui              |   77 +++++++++++
 15 files changed, 885 insertions(+), 2 deletions(-)
---