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

[John Ralls <jralls src gnome org>]

commit ab5b55e4b8711ab9fa14b4d2966b09b1bfa86d7d
Merge: 2bbc232 6cee81c
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jun 2 23:21:21 2011 -0700

    Merge branch 'master' into quartz-integration

 demos/gtk-demo/changedisplay.c    |    2 +-
 gtk/gtkaccelgroup.c               |   11 ++++++-----
 gtk/gtkaccelgroupprivate.h        |    2 --
 gtk/gtkaccellabel.c               |   11 ++++++-----
 gtk/gtkprintbackend.c             |    3 +--
 gtk/gtkstatusicon.c               |   10 ++++++++--
 modules/input/gtkimcontextxim.c   |    2 +-
 modules/other/gail/gailmenuitem.c |   35 ++++++++++++++++++++++++++++++-----
 tests/testfilechooser.c           |    4 ++--
 tests/testgtk.c                   |   18 ++++++++++++------
 10 files changed, 67 insertions(+), 31 deletions(-)
---