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

[John Ralls <jralls src gnome org>]

commit 072d6ffec8927302de5678bb9a639d7222605fbc
Merge: c367119 8816a12
Author: John Ralls <jralls ceridwen us>
Date:   Wed May 4 23:21:18 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkcursor-x11.c           |   25 +-
 po-properties/es.po               | 2304 +++++++++++++++++++------------------
 tests/reftests/Makefile.am        |    5 +-
 tests/reftests/box-packing.css    |    8 +
 tests/reftests/box-packing.ref.ui |  343 ++++++
 tests/reftests/box-packing.ui     |  208 ++++
 6 files changed, 1748 insertions(+), 1145 deletions(-)
---