[gtk+/introspection: 9/11] Merge commit 'origin' into introspection

[Johan Dahlin <johan src gnome org>]

commit 9da7676fe3fba3e010cf99344788af309c04a457
Merge: 0f3fe10... 182108c...
Author: Johan Dahlin <johan gnome org>
Date:   Mon Dec 14 21:02:05 2009 -0200

    Merge commit 'origin' into introspection

 gdk/directfb/gdkscreen-directfb.c |    8 +
 gdk/quartz/gdkscreen-quartz.c     |   10 +-
 gdk/win32/gdkscreen-win32.c       |    8 +
 gtk/gtkassistant.c                |   15 +-
 gtk/gtkbutton.c                   |   13 +-
 gtk/gtktoolitem.c                 |    2 +-
 gtk/tests/treeview.c              |    2 +-
 po/es.po                          | 2227 +++++++++++++++++++------------------
 po/nds.po                         |  484 +++++----
 tests/testassistant.c             |   14 +-
 10 files changed, 1461 insertions(+), 1322 deletions(-)
---