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

[John Ralls <jralls src gnome org>]

commit 881fc925f934f27060e3cf1153c3bbf48b9cf613
Merge: 94f07da ebda721
Author: John Ralls <jralls ceridwen us>
Date:   Sun Apr 10 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/tmpl/.gitignore                 |   12 +
 docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml  |   90 --------
 .../gtk/tmpl/gtkcellrendererprogress.sgml          |   72 ------
 docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml |  127 -----------
 docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml  |   57 -----
 docs/reference/gtk/tmpl/gtkfontbutton.sgml         |  194 ----------------
 docs/reference/gtk/tmpl/gtkhpaned.sgml             |   39 ----
 docs/reference/gtk/tmpl/gtkhscale.sgml             |   54 -----
 docs/reference/gtk/tmpl/gtkhscrollbar.sgml         |   44 ----
 docs/reference/gtk/tmpl/gtkimagemenuitem.sgml      |  152 -------------
 docs/reference/gtk/tmpl/gtkimcontext.sgml          |  213 ------------------
 docs/reference/gtk/tmpl/gtkinvisible.sgml          |   73 ------
 docs/reference/gtk/tmpl/gtkmisc.sgml               |  137 ------------
 gdk/broadway/broadway.js                           |  232 +++++++++++++++++---
 gdk/broadway/client.html                           |   58 +++++-
 gdk/broadway/gdkdisplay-broadway.c                 |    6 +-
 gdk/broadway/gdkwindow-broadway.c                  |    8 -
 gtk/gtkcellrendereraccel.c                         |   15 ++
 gtk/gtkcellrendererprogress.c                      |   12 +
 gtk/gtkcellrenderertoggle.c                        |   12 +
 gtk/gtkfilechooserwidget.c                         |   19 ++
 gtk/gtkfontbutton.c                                |   12 +
 gtk/gtkhpaned.c                                    |   19 ++
 gtk/gtkhscale.c                                    |   21 ++
 gtk/gtkhscrollbar.c                                |   15 ++
 gtk/gtkimagemenuitem.c                             |   11 +
 gtk/gtkinvisible.c                                 |   14 ++
 gtk/gtkmisc.c                                      |   42 ++++
 28 files changed, 470 insertions(+), 1290 deletions(-)
---