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

[John Ralls <jralls src gnome org>]

commit f75a882670a808ff38b479284a5a3dc7393b9db0
Merge: 964b25d be152f9
Author: John Ralls <jralls ceridwen us>
Date:   Fri Sep 2 23:21:05 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkcssprovider.c   |   36 +-
 gtk/gtkgrid.c          |  189 ++-
 gtk/gtkplug.c          |   11 +-
 gtk/gtkthemingengine.c |   57 +-
 gtk/gtktreeview.c      |   61 +-
 gtk/tests/Makefile.am  |    4 +
 gtk/tests/grid.c       |  238 ++++
 po-properties/pt_BR.po | 3212 +++++++++++++++++++++++++-----------------------
 po/pt_BR.po            |  740 ++++++------
 9 files changed, 2500 insertions(+), 2048 deletions(-)
---