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

[John Ralls <jralls src gnome org>]

commit d6d3535065a37dc2a284ebf89851f6f4e2203b66
Merge: 881fc92 3fbfd82
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 11 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/tmpl/.gitignore                 |    5 +
 docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml  |   78 --
 docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml |   98 --
 docs/reference/gtk/tmpl/gtkcellrendererspin.sgml   |   68 -
 docs/reference/gtk/tmpl/gtkhseparator.sgml         |   53 -
 docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml    |   60 -
 gdk/broadway/broadway.js                           |  121 +-
 gdk/broadway/client.html                           |    2 +-
 gdk/broadway/gdkwindow-broadway.c                  |   12 +-
 gdk/broadway/gdkwindow-broadway.h                  |    1 +
 gtk/gtkcellrenderercombo.c                         |   21 +
 gtk/gtkcellrendererpixbuf.c                        |   20 +
 gtk/gtkcellrendererspin.c                          |   22 +
 gtk/gtkhseparator.c                                |   26 +
 gtk/gtkstatusbar.c                                 |   55 +-
 gtk/gtktearoffmenuitem.c                           |   29 +
 gtk/gtkwindow.c                                    |    7 +-
 po/ja.po                                           | 1372 ++++++++++++--------
 18 files changed, 1053 insertions(+), 997 deletions(-)
---