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

[John Ralls <jralls src gnome org>]

commit 486b474807540d8faf759422f12506a48f1371fb
Merge: 04cba25 09efa56
Author: John Ralls <jralls ceridwen us>
Date:   Thu Apr 14 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/tmpl/.gitignore             |    6 +
 docs/reference/gtk/tmpl/gtkhsv.sgml            |  142 ---
 docs/reference/gtk/tmpl/gtkicontheme.sgml      |  502 --------
 docs/reference/gtk/tmpl/gtklabel.sgml          |  751 ------------
 docs/reference/gtk/tmpl/gtkliststore.sgml      |  389 ------
 docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml |  136 --
 docs/reference/gtk/tmpl/gtktoolbutton.sgml     |  253 ----
 gdk/broadway/broadway.js                       | 1558 +++++++++++++++++++++++-
 gdk/broadway/gdkdisplay-broadway.c             |    2 +
 gdk/broadway/gdkdisplay-broadway.h             |    1 +
 gdk/broadway/gdkeventsource.c                  |    4 +
 gdk/broadway/gdkkeys-broadway.c                |   38 +-
 gdk/gdk.symbols                                |    1 +
 gtk/gtkcssprovider.c                           |   20 +-
 gtk/gtkhsv.c                                   |   15 +
 gtk/gtkicontheme.c                             |   86 ++
 gtk/gtkicontheme.h                             |   22 +
 gtk/gtkkeyhash.c                               |    5 +-
 gtk/gtklabel.c                                 |  196 +++-
 gtk/gtkliststore.c                             |  154 +++
 gtk/gtkmenushell.c                             |    7 +-
 gtk/gtkmenutoolbutton.c                        |   36 +
 gtk/gtksizerequest.c                           |    2 +-
 gtk/gtktimeline.c                              |   12 +-
 gtk/gtktoolbutton.c                            |   31 +
 tests/testgtk.c                                |   39 +-
 26 files changed, 2186 insertions(+), 2222 deletions(-)
---