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

[Tristan Van Berkom <tvb src gnome org>]

commit 8740bd2faf6e40d71a2a8288d22d7396247dd353
Merge: 360e2c4 9ddef23
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Aug 7 19:24:35 2010 -0400

    Merge branch 'master' into native-layout
    
    Conflicts:
    	gtk/gtkframe.c
    	tests/testheightforwidth.c

 demos/testpixbuf.c                   |    1 -
 docs/reference/gdk/gdk3-sections.txt |    1 +
 docs/sizing-test.txt                 |    3 +-
 docs/tutorial/gtk-tut.sgml           |    1 -
 gdk/gdk.symbols                      |    1 +
 gdk/gdkdisplay.c                     |   16 +
 gdk/gdkdisplay.h                     |    3 +-
 gtk/gtk.symbols                      |    1 +
 gtk/gtkbox.c                         |  666 ++++++++++++++++++----------------
 gtk/gtkbutton.c                      |   34 +-
 gtk/gtkframe.c                       |    2 +-
 gtk/gtklabel.c                       |   78 +---
 gtk/gtkwindow-decorate.c             |    4 +-
 gtk/gtkwindow.c                      |    4 -
 tests/simple.c                       |    3 +-
 tests/testgtk.c                      |   36 +--
 tests/testmultiscreen.c              |    3 +-
 tests/testrgb.c                      |    1 -
 18 files changed, 424 insertions(+), 434 deletions(-)
---