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

[John Ralls <jralls src gnome org>]

commit fee50a618806033e1b4ac8957141dd48f8bd70a8
Merge: e244e8f 5c09061
Author: John Ralls <jralls ceridwen us>
Date:   Tue Aug 23 23:21:06 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkappchooserbutton.c   |    2 +
 gtk/gtkappchooserdialog.c   |   21 +-
 gtk/gtkcolorsel.c           |    2 +-
 gtk/gtkcolorseldialog.c     |    8 +-
 gtk/gtkfilechooserdefault.c |  126 ++
 gtk/gtkfilechooserprivate.h |    1 +
 gtk/gtkfontchooser.c        |   48 +-
 gtk/gtkfontchooser.h        |    3 +
 gtk/gtkfontchooserdialog.c  |   24 +-
 gtk/gtkswitch.c             |    6 +-
 po-properties/POTFILES.in   |    3 +-
 po-properties/POTFILES.skip |   61 +
 po-properties/gu.po         | 5039 +++++++++++++++++++++++++------------------
 po/POTFILES.in              |    4 +-
 po/POTFILES.skip            |   61 +
 po/sr.po                    | 2657 +++++++++++++----------
 po/sr latin po              | 2657 +++++++++++++----------
 17 files changed, 6339 insertions(+), 4384 deletions(-)
---