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

[John Ralls <jralls src gnome org>]

commit b48c9a35cf4ff2690b3719c0dc5aaaa7050a8093
Merge: 851abe7 48b4797
Author: John Ralls <jralls ceridwen us>
Date:   Sun Dec 26 23:21:07 2010 -0800

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkdisplaymanager-x11.c |   12 +-
 gdk/x11/gdkwindow-x11.c         |    2 +-
 gtk/Makefile.am                 |    3 +-
 gtk/gtkcheckmenuitem.c          |  167 +-
 gtk/gtkhsv.c                    |    6 +-
 gtk/gtkimagemenuitem.c          |  339 +++---
 gtk/gtkmenu.c                   |   25 +-
 gtk/gtkmenubar.c                |   22 +-
 gtk/gtkmenuitem.c               | 1231 ++++++++--------
 gtk/gtkmenuitem.h               |   77 +-
 gtk/gtkmenuitemprivate.h        |   63 +
 gtk/gtkmenushell.c              |   45 +-
 gtk/gtknotebook.c               |    4 +-
 gtk/gtktearoffmenuitem.c        |   31 +-
 gtk/gtktextchild.h              |   11 +-
 gtk/gtktextmark.h               |   21 +-
 gtk/gtktooltip.c                |    6 +-
 gtk/gtktreeview.c               |   30 +-
 po-properties/pa.po             | 3191 +++++++++++++++++++++------------------
 19 files changed, 2773 insertions(+), 2513 deletions(-)
---