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

[John Ralls <jralls src gnome org>]

commit 1ccd4b20a4c5e5af09bce0f97baf2bab74cd70ff
Merge: 177c658 d4ac3c8
Author: John Ralls <jralls ceridwen us>
Date:   Thu Feb 10 23:21:33 2011 -0800

    Merge branch 'master' into quartz-integration

 INSTALL.in                                  |    8 ++--
 NEWS                                        |    3 +
 README.in                                   |    5 ++
 configure.ac                                |    8 ++--
 demos/Makefile.am                           |    6 +-
 demos/gtk-demo/Makefile.am                  |    6 +-
 docs/reference/gdk/Makefile.am              |    2 +-
 docs/reference/gtk/Makefile.am              |    2 +-
 docs/reference/gtk/compiling.sgml           |    2 +-
 docs/tools/Makefile.am                      |   10 ++--
 examples/Makefile.am                        |    4 +-
 gail-3.0-uninstalled.pc.in                  |    2 +-
 gail-3.0.pc.in                              |    2 +-
 gdk-3.0.pc.in                               |    2 +-
 gdk/Makefile.am                             |   32 ++++++------
 gdk/abicheck.sh                             |    2 +-
 gdk/tests/Makefile.am                       |    2 +-
 gtk+-3.0-uninstalled.pc.in                  |    2 +-
 gtk+-3.0.pc.in                              |    2 +-
 gtk-config-2.0.in                           |    4 --
 gtk/Makefile.am                             |   30 ++++++------
 gtk/abicheck.sh                             |    2 +-
 gtk/gtkappchooserbutton.h                   |    3 +
 gtk/gtkappchooserdialog.h                   |    4 ++
 gtk/gtkappchooserwidget.h                   |    4 ++
 gtk/tests/Makefile.am                       |    6 +-
 modules/engines/ms-windows/Makefile.am      |    4 +-
 modules/engines/pixbuf/Makefile.am          |    6 +-
 modules/input/Makefile.am                   |    4 +-
 modules/other/gail/Makefile.am              |    4 +-
 modules/other/gail/libgail-util/Makefile.am |   18 ++++----
 modules/other/gail/tests/Makefile.am        |   70 +++++++++++++-------------
 modules/printbackends/cups/Makefile.am      |    2 +-
 modules/printbackends/file/Makefile.am      |    2 +-
 modules/printbackends/lpr/Makefile.am       |    2 +-
 modules/printbackends/papi/Makefile.am      |    2 +-
 modules/printbackends/test/Makefile.am      |    2 +-
 perf/Makefile.am                            |    6 +-
 tests/Makefile.am                           |    8 ++--
 39 files changed, 150 insertions(+), 135 deletions(-)
---