[gtk+/quartz-integration: 7/7] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit 4ac587f4491a32e456600db1989c15e121c9033b
Merge: 9cf2561 f74585c
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jun 23 23:21:24 2011 -0700

    Merge branch 'master' into quartz-integration

 build/win32/vs10/gtk+.props                        |    4 +
 build/win32/vs10/gtk+.sln                          |    2 +-
 .../vs10/{gtk-demo.vcxproj => gtk3-demo.vcxproj}   |    6 +-
 ...o.vcxproj.filters => gtk3-demo.vcxproj.filters} |    3 +
 build/win32/vs9/gtk+.sln                           |    2 +-
 build/win32/vs9/gtk+.vsprops                       |    6 +-
 .../vs9/{gtk-demo.vcproj => gtk3-demo.vcproj}      |  425 +-
 gdk/wayland/gdkcursor-wayland.c                    |    2 +-
 gdk/wayland/gdkdisplay-wayland.c                   |   42 +-
 gdk/wayland/gdkdisplay-wayland.h                   |    1 +
 gdk/wayland/gdkscreen-wayland.c                    |    7 +-
 gdk/wayland/gdkwindow-wayland.c                    |    8 +-
 gtk/gtkpaned.c                                     |    2 +-
 gtk/gtkwin32embedwidget.c                          |    2 +
 po-properties/fa.po                                | 5682 +++++++++++---------
 po/fa.po                                           | 2204 +++++---
 16 files changed, 4886 insertions(+), 3512 deletions(-)
---