[gtk+/xi2: 324/324] Merge branch 'master' into xi2

[Carlos Garnacho <carlosg src gnome org>]

commit 04fea1019b333585eb58dab0ae0173bb082a70ed
Merge: adb3a98 04dc62c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu May 20 16:37:59 2010 +0200

    Merge branch 'master' into xi2

 demos/Makefile.am                             |    4 +-
 demos/gtk-demo/main.c                         |    4 +-
 demos/pixbuf-init.c                           |    2 +-
 docs/reference/gtk/gtk3-sections.txt          |    1 +
 docs/reference/gtk/running.sgml               |    6 +-
 docs/reference/gtk/tmpl/.gitignore            |    2 +
 docs/reference/gtk/tmpl/gtkradiobutton.sgml   |  201 -----
 docs/reference/gtk/tmpl/gtkrecentchooser.sgml |  442 ----------
 gdk-pixbuf/Makefile.am                        |   24 +-
 gdk/tests/Makefile.am                         |    2 +-
 gtk-zip.sh.in                                 |    4 +-
 gtk/Makefile.am                               |    4 +-
 gtk/gtk.symbols                               |    1 +
 gtk/gtkbuildable.c                            |   12 +-
 gtk/gtkobject.c                               |   55 +--
 gtk/gtkradioaction.c                          |   55 ++
 gtk/gtkradioaction.h                          |    2 +
 gtk/gtkradiobutton.c                          |  127 +++-
 gtk/gtkrecentchooser.c                        |   17 +
 gtk/gtkrecentchooser.h                        |   21 +-
 gtk/tests/pixbuf-init.c                       |    2 +-
 modules/input/Makefile.am                     |   20 +-
 po/et.po                                      | 1091 +------------------------
 tests/testcombochange.c                       |    4 +-
 tests/testdnd.c                               |    4 +-
 tests/testgtk.c                               |    4 +-
 tests/testtext.c                              |    4 +-
 27 files changed, 292 insertions(+), 1823 deletions(-)
---