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

[John Ralls <jralls src gnome org>]

commit f25e992ba1d8303bb433353e15b595d05e392f5d
Merge: 40450bc 3810e4d
Author: John Ralls <jralls ceridwen us>
Date:   Wed Dec 29 23:21:23 2010 -0800

    Merge branch 'master' into quartz-integration

 gtk/gtkalignment.c   |   70 +++++++++++-
 gtk/gtkbin.c         |    5 +
 gtk/gtkcheckbutton.c |   13 +--
 gtk/gtksizerequest.c |   16 ---
 po/es.po             |  305 ++++++++++++++++++++++++--------------------------
 po/gl.po             |    6 +-
 6 files changed, 225 insertions(+), 190 deletions(-)
---