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

[John Ralls <jralls src gnome org>]

commit 29e0318fefabe59d7075b8eec9d8fa47d3229ed8
Merge: 0e1df60 39d4207
Author: John Ralls <jralls ceridwen us>
Date:   Sat Mar 5 23:21:10 2011 -0800

    Merge branch 'master' into quartz-integration

 gtk/Makefile.am                                    |    6 +-
 gtk/gtkbox.c                                       |    4 +-
 gtk/gtkiconfactory.c                               |    2 +-
 gtk/gtkmain.c                                      |   25 +-
 gtk/gtkrecentmanager.c                             |    2 +-
 gtk/gtkthemingengine.c                             |   26 +-
 .../{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
 po-properties/es.po                                |  652 ++--
 po-properties/lv.po                                | 4643 ++++++++++++--------
 12 files changed, 3062 insertions(+), 2298 deletions(-)
---