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

[John Ralls <jralls src gnome org>]

commit 273ab98f2e5c250ac0bfd320cf219732455b7a71
Merge: 7f27d65 0f458f1
Author: John Ralls <jralls ceridwen us>
Date:   Fri Aug 19 23:21:05 2011 -0700

    Merge branch 'master' into quartz-integration

 config.h.win32.in      |   17 ++-
 configure.ac           |   12 ++
 gtk/fallback-c89.c     |   58 ++++++
 gtk/gtkborderimage.c   |    5 +
 gtk/gtklabel.c         |   25 +--
 gtk/gtkstyleproperty.c |    5 +
 gtk/gtktreedatalist.c  |   18 ++
 po/fa.po               |  511 +++++++++++++++++++++++++-----------------------
 8 files changed, 386 insertions(+), 265 deletions(-)
---