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

[John Ralls <jralls src gnome org>]

commit 2a81ad45e71e63501ca51513b936fef85de13111
Merge: a9b9dc8 1779ae7
Author: John Ralls <jralls ceridwen us>
Date:   Sun Nov 28 16:19:27 2010 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3.types     |    3 -
 gdk/gdkrgba.c                     |    6 +-
 gdk/gdkrgba.h                     |    4 +-
 gdk/tests/gdk-color.c             |   16 +-
 gdk/x11/gdkapplaunchcontext-x11.c |  187 +-
 gtk/gtkbuilder.c                  |    2 +-
 gtk/gtkcellrenderer.c             |    2 +-
 gtk/gtkcellrenderertext.c         |    4 +-
 gtk/gtkiconview.c                 |   45 +-
 po-properties/ro.po               | 4391 ++++++++++++++++++-------------------
 po/id.po                          | 1897 ++++++++--------
 po/ro.po                          | 1826 ++++++++--------
 12 files changed, 4095 insertions(+), 4288 deletions(-)
---