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

[John Ralls <jralls src gnome org>]

commit ed6eeed27dc6810d19f166e5b8eb2934431e4182
Merge: 56494f7 1bca4f3
Author: John Ralls <jralls ceridwen us>
Date:   Mon Aug 15 23:21:29 2011 -0700

    Merge branch 'master' into quartz-integration

 NEWS                                 |   40 +
 configure.ac                         |    2 +-
 docs/reference/gtk/gtk-docs.sgml     |    2 +
 docs/reference/gtk/gtk3-sections.txt |   56 +
 gdk/win32/Makefile.am                |   10 +
 gtk/Makefile.am                      |    4 +
 gtk/gtk.h                            |    2 +
 gtk/gtk.symbols                      |   21 +
 gtk/gtkassistant.h                   |    2 +-
 gtk/gtkfontbutton.c                  |   99 +-
 gtk/gtkfontchooser.c                 | 1332 +++++++++++++
 gtk/gtkfontchooser.h                 |  106 ++
 gtk/gtkfontchooserdialog.c           |  311 +++
 gtk/gtkfontchooserdialog.h           |   76 +
 gtk/gtkfontsel.c                     |   55 +-
 gtk/gtkfontsel.h                     |    4 +
 gtk/gtknotebook.c                    |    2 -
 gtk/gtktextiter.c                    |   22 +
 gtk/gtktextiter.h                    |    6 +-
 po-properties/pa.po                  | 3440 ++++++++++++++++++----------------
 po/pa.po                             | 1035 ++++++-----
 tests/Makefile.am                    |   24 +
 tests/testfontchooser.c              |   67 +
 tests/testfontchooserdialog.c        |   36 +
 tests/testfontselection.c            |   80 +
 tests/testfontselectiondialog.c      |   43 +
 tests/testgtk.c                      |   11 -
 27 files changed, 4720 insertions(+), 2168 deletions(-)
---