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

[John Ralls <jralls src gnome org>]

commit e5c5fde65fe80b385e71814a5e710d61fb40a900
Merge: 3572ca2 6c4196e
Author: John Ralls <jralls ceridwen us>
Date:   Thu Feb 24 23:21:09 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/x11/gdkscreen-x11.c     |   14 +-
 gtk/gtkcellview.c           |    3 +
 gtk/gtkcombobox.c           |    3 +
 gtk/gtkentrycompletion.c    |    3 +
 gtk/gtkfilechooserdefault.c |   43 +-
 gtk/gtkiconview.c           |    3 +
 gtk/gtktreeviewcolumn.c     |    3 +
 po/sl.po                    |11652 ++++++++++++++++++++++++++-----------------
 8 files changed, 7030 insertions(+), 4694 deletions(-)
---