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

[John Ralls <jralls src gnome org>]

commit 4999a7a78ba845eac7f7c8ad6228f5785655bc77
Merge: 0010ead dc56a51
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 18 23:21:12 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/tmpl/.gitignore        |    1 +
 docs/reference/gtk/tmpl/gtkuimanager.sgml |  508 --------------------------
 gdk/broadway/Makefile.am                  |    3 -
 gdk/broadway/broadway-demo.c              |  230 ------------
 gdk/broadway/broadway.c                   |  553 +++++-----------------------
 gdk/broadway/broadway.h                   |    3 +-
 gdk/broadway/broadway.js                  |  112 ++++--
 gdk/broadway/client.html                  |    8 +-
 gdk/broadway/gdkdisplay-broadway.c        |   43 +--
 gtk/gtkuimanager.c                        |  254 +++++++++++++
 gtk/gtkuimanager.h                        |   18 +
 gtk/gtkwidget.c                           |   18 +-
 12 files changed, 486 insertions(+), 1265 deletions(-)
---