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

[John Ralls <jralls src gnome org>]

commit 59d301bd320ea2a0e708a57ee9d84a6460f7dd9e
Merge: 8cf0819 c44fe0b
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jan 17 23:22:07 2011 -0800

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

 docs/reference/gtk/gtk-builder-convert.xml |   11 ++++++++++
 gtk/gtk-builder-convert                    |   31 ++++++++++++++++++++++++++-
 gtk/gtktoolpalette.c                       |   14 ++++++------
 gtk/gtktoolshell.c                         |    2 +-
 gtk/gtktreeselection.c                     |    8 +++---
 gtk/gtktreestore.c                         |    2 +-
 gtk/gtkuimanager.c                         |    2 +-
 7 files changed, 54 insertions(+), 16 deletions(-)
---