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

[John Ralls <jralls src gnome org>]

commit 215bea389d643b6b270c75db703d76fe05400f34
Merge: ad9ad59 a6899f2
Author: John Ralls <jralls ceridwen us>
Date:   Wed Aug 31 23:21:31 2011 -0700

    Merge branch 'master' into quartz-integration

 demos/gtk-demo/appwindow.c |   47 ++++++++-----------------
 demos/gtk-demo/assistant.c |    1 +
 demos/gtk-demo/dialog.c    |   42 +++++++++--------------
 demos/gtk-demo/panes.c     |   81 +++++++++++++++++++------------------------
 demos/gtk-demo/pickers.c   |   30 +++++++++-------
 demos/gtk-demo/sizegroup.c |   37 +++++++++-----------
 6 files changed, 101 insertions(+), 137 deletions(-)
---