[gtk+/gtk-2-24-quartz: 5/5] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit aa4b973de6aeb2d2732c3e5a24679224b9e2b641
Merge: e74ba25 ac9e571
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 1 23:22:15 2011 -0700

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 NEWS                                               |   16 +
 configure.in                                       |    4 +-
 gtk/Makefile.am                                    |  443 ++++++++++----------
 .../{document-x-generic.png => text-x-generic.png} |  Bin 569 -> 569 bytes
 .../{document-x-generic.svg => text-x-generic.svg} |    0
 .../{document-x-generic.png => text-x-generic.png} |  Bin 736 -> 736 bytes
 .../{document-x-generic.svg => text-x-generic.svg} |    0
 7 files changed, 245 insertions(+), 218 deletions(-)
---