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

[John Ralls <jralls src gnome org>]

commit c513ee609a851acb4435c07b6f5ff6a90a7e6909
Merge: 3b98e38 ff9eb56
Author: John Ralls <jralls ceridwen us>
Date:   Wed Mar 16 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/broadway/gdkwindow-broadway.c |    2 +-
 gdk/gdkkeyuni.c                   |   25 ++++++++++++++++++-------
 gtk/gtkcontainer.c                |    4 +++-
 gtk/gtkimcontextsimple.c          |    2 +-
 gtk/gtkimmulticontext.c           |    2 +-
 gtk/gtkrange.c                    |   12 +-----------
 gtk/gtkwidget.c                   |    2 ++
 7 files changed, 27 insertions(+), 22 deletions(-)
---