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

[John Ralls <jralls src gnome org>]

commit 26b57dd6252b64fe09c4b7a1852772760afbab75
Merge: b3c2d13 17f99f6
Author: John Ralls <jralls ceridwen us>
Date:   Mon Aug 8 23:21:15 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt |    3 +
 gtk/gtk.symbols                      |    3 +
 gtk/gtkappchooser.c                  |    2 +-
 gtk/gtkgrid.c                        |  136 ++++++++++++++++++++++++++++++++++
 gtk/gtkgrid.h                        |    7 ++
 tests/testgrid.c                     |   74 ++++++++++++++++++
 6 files changed, 224 insertions(+), 1 deletions(-)
---