[gtk+/native-layout-incubator-2: 18/18] Merge branch 'master' into native-layout-incubator-2

[Tristan Van Berkom <tvb src gnome org>]

commit d8da5ac1674707afe8762514720c2ba2a3b60058
Merge: 2254a50 c9579f3
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Aug 6 13:22:00 2010 -0400

    Merge branch 'master' into native-layout-incubator-2
    
    Conflicts:
    	tests/testheightforwidth.c

 gtk/gtkbbox.c          |    4 +-
 gtk/gtkbox.c           |   24 +
 gtk/gtkbox.h           |    1 +
 gtk/gtkscale.c         |    2 +-
 gtk/gtkstatusbar.c     |   10 +-
 gtk/gtkstatusicon.c    |    6 +-
 gtk/gtktextbuffer.c    |    4 +-
 gtk/gtktoolbutton.c    |   41 +-
 gtk/gtktooltip.c       |    2 +
 gtk/gtktreemodel.c     |    2 +-
 gtk/gtktreeselection.c |    2 +-
 po-properties/es.po    |  301 ++--
 po-properties/gl.po    |  248 ++--
 po-properties/he.po    |  294 ++--
 po-properties/ro.po    | 3759 ++++++++++++++++++------------------
 po-properties/sv.po    | 5063 +++++++++++++++++++++++-------------------------
 po/ro.po               | 1738 +++++++++---------
 po/sv.po               | 2413 +++++++++--------------
 18 files changed, 6654 insertions(+), 7260 deletions(-)
---