[pygtk/windows: 31/32] Merge branch 'master' into windows

[John Stowers <jstowers src gnome org>]

commit 5c2e5c8f0cb0e270c30c0269ab4f5081474c3e67
Merge: 1c25a41 e89fa3c
Author: John Stowers <john stowers gmail com>
Date:   Sat Oct 16 18:18:31 2010 +1300

    Merge branch 'master' into windows

 AUTHORS                                   |    1 +
 MAINTAINERS                               |    4 +
 NEWS                                      |   12 +
 configure.ac                              |   44 ++-
 docs/reference/ChangeLog                  |    4 +
 docs/reference/pygtk-gtkcurve.xml         |    4 +-
 examples/gtk/application.py               |   10 +-
 examples/gtk/mirror.py                    |  328 +++++++++++++
 examples/gtk/toolbar.py                   |   55 +++
 examples/pygtk-demo/demos/print_editor.py |    6 +-
 examples/pygtk-demo/demos/spinner.py      |   63 +++
 examples/pygtk-demo/demos/toolpalette.py  |  111 +++++
 examples/pygtk-demo/pygtk-demo.py         |    5 +-
 gtk/Makefile.am                           |   27 +-
 gtk/gdk-2.18.defs                         |   19 +
 gtk/gdk-2.20.defs                         |   30 ++
 gtk/gdk-2.22.defs                         |  324 +++++++++++++
 gtk/gdk-base-types.defs                   |    2 +
 gtk/gdk.override                          |   28 ++
 gtk/gtk-2.12.defs                         |   18 +
 gtk/gtk-2.14.defs                         |   27 +-
 gtk/gtk-2.16.defs                         |   16 +
 gtk/gtk-2.20-types.defs                   |   50 ++
 gtk/gtk-2.20.defs                         |  722 +++++++++++++++++++++++++++++
 gtk/gtk-2.22.defs                         |  193 ++++++++
 gtk/gtk-base.defs                         |    1 +
 gtk/gtk.override                          |    5 +-
 gtk/gtkmodule.c                           |   30 --
 gtk/gtkunixprint-2.20.defs                |   14 +
 pygtk-2.0.pc.in                           |    2 +-
 setup.py                                  |    7 +-
 31 files changed, 2110 insertions(+), 52 deletions(-)
---