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

[John Ralls <jralls src gnome org>]

commit 3cb9e5f3eadfac901ea6422ff6c544131fabfba9
Merge: 8548453 33a46dd
Author: John Ralls <jralls ceridwen us>
Date:   Sat Feb 12 23:21:28 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/running.sgml            |   28 +
 gdk/gdkdisplaymanager.c                    |   10 +-
 gtk/Makefile.am                            |    4 +-
 gtk/gtkcolorsel.c                          |    2 -
 modules/other/gail/libgail-util/gailmisc.c |   48 +-
 po/he.po                                   |  767 ++++++++++++++++-----------
 po/ko.po                                   |  312 +++++++++---
 po/nb.po                                   |  106 ++--
 tests/simple.c                             |   33 +-
 tests/testcombo.c                          |    2 -
 tests/testexpand.c                         |   10 -
 tests/testfilechooser.c                    |    3 +-
 tests/testgtk.c                            |   15 +-
 tests/testnouiprint.c                      |   12 +-
 tests/testrecentchooser.c                  |    3 +-
 15 files changed, 822 insertions(+), 533 deletions(-)
---