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

[John Ralls <jralls src gnome org>]

commit 3344ec7b7fb83b5323cc5bf124beb2106c3b2680
Merge: 4d17fee 55e093d
Author: John Ralls <jralls ceridwen us>
Date:   Thu May 12 23:21:07 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/migrating-GtkGrid.xml |   58 +-
 gtk/gtkgrid.c                            |   24 +
 gtk/gtkthemingengine.c                   |    1 +
 po-properties/he.po                      | 2613 ++++++++++++++++--------------
 po/he.po                                 |  575 ++++---
 tests/reftests/Makefile.am               |    3 +
 tests/reftests/align-expand.sh           |  222 +++
 tests/reftests/rotated-layout.ref.ui     |   41 +
 tests/reftests/rotated-layout.ui         |   41 +
 9 files changed, 2075 insertions(+), 1503 deletions(-)
---