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

[John Ralls <jralls src gnome org>]

commit ee10de0a91163d2d34fe71a929c8e8a00cf6c5c5
Merge: 32b77a4 8e6932f
Author: John Ralls <jralls ceridwen us>
Date:   Sat Feb 19 23:21:14 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/migrating-2to3.xml |   23 +++++++++++----------
 gdk/win32/gdkevents-win32.c           |   16 +++++++++-----
 gtk/gtkcomboboxtext.c                 |   20 +++++++++++++-----
 gtk/gtksearchenginetracker.c          |    2 +-
 modules/other/gail/gailtextcell.c     |   34 ++++++++++++++++----------------
 po/de.po                              |    2 +-
 6 files changed, 55 insertions(+), 42 deletions(-)
---