[gtk+/native-layout: 16/16] Merge branch 'master' into native-layout

[Tristan Van Berkom <tvb src gnome org>]

commit 7c66a29e87c7203cd1181588c23401fab7cf04b4
Merge: 0eff406 a090f33
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun Jun 20 14:23:14 2010 -0400

    Merge branch 'master' into native-layout

 docs/reference/gdk/gdk3-sections.txt |   42 -
 docs/reference/gdk/tmpl/drawing.sgml |   76 -
 docs/reference/gdk/tmpl/fonts.sgml   |  217 +-
 docs/reference/gdk/tmpl/input.sgml   |   96 -
 docs/reference/gtk/gtk3.types        |    2 +-
 gdk-pixbuf/Makefile.am               |    4 +-
 gdk/Makefile.am                      |    4 +-
 gdk/directfb/gdkdnd-directfb.c       |   10 +-
 gdk/directfb/gdkdrawable-directfb.c  |   30 -
 gdk/directfb/gdkfont-directfb.c      |   72 -
 gdk/directfb/gdkim-directfb.c        |  259 -
 gdk/gdk.h                            |   25 -
 gdk/gdk.symbols                      |   38 -
 gdk/gdkdraw.c                        |  178 -
 gdk/gdkdrawable.h                    |   56 -
 gdk/gdkevents.c                      |  114 -
 gdk/gdkfont.c                        |  234 -
 gdk/gdkfont.h                        |   51 -
 gdk/gdkoffscreenwindow.c             |   52 -
 gdk/gdkpango.h                       |    2 +-
 gdk/gdkpixmap.c                      |   48 -
 gdk/gdktypes.h                       |   18 -
 gdk/gdkwindow.c                      |   52 -
 gdk/quartz/gdkdrawable-quartz.c      |   26 -
 gdk/quartz/gdkfont-quartz.c          |   45 -
 gdk/quartz/gdkim-quartz.c            |   31 -
 gdk/win32/gdkdrawable-win32.c        |  139 -
 gdk/win32/gdkfont-win32.c            |  180 -
 gdk/win32/gdkim-win32.c              |   31 -
 gdk/x11/gdkdrawable-x11.c            |  113 -
 gdk/x11/gdkfont-x11.c                |  297 -
 gdk/x11/gdkim-x11.c                  |  133 -
 gtk/Makefile.am                      |    4 +-
 gtk/gtk.symbols                      |    1 +
 gtk/gtkapplication.c                 |   28 +-
 gtk/gtkmain.c                        |   18 +
 gtk/gtkruler.c                       |    3 +-
 gtk/gtkspinbutton.c                  |    4 +-
 gtk/gtkstyle.c                       |   54 -
 po/sl.po                             |11086 ++++++++++++++++------------------
 40 files changed, 5214 insertions(+), 8659 deletions(-)
---