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

[John Ralls <jralls src gnome org>]

commit 53b8d160af0e170f7361c05b497ec27a71161272
Merge: e4b0cbe e369d70
Author: John Ralls <jralls ceridwen us>
Date:   Mon Dec 27 13:15:43 2010 -0800

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

 gdk/gdk.symbols                   |    2 +
 gtk/gtkactiongroup.c              |    2 +-
 gtk/gtkeditable.c                 |    2 +-
 gtk/updateiconcache.c             |    2 +
 modules/other/gail/gailtoplevel.c |   38 ++++++++++++++++--------------------
 5 files changed, 23 insertions(+), 23 deletions(-)
---