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

[John Ralls <jralls src gnome org>]

commit 964b25d17b4586a59fb67a19d4f488c7ec3c6894
Merge: 215bea3 22d046d
Author: John Ralls <jralls ceridwen us>
Date:   Thu Sep 1 23:21:08 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                       |    6 +-
 demos/gtk-demo/appwindow.c         |  101 ++++----
 demos/gtk-demo/assistant.c         |   17 +-
 demos/gtk-demo/builder.c           |   16 +-
 demos/gtk-demo/button_box.c        |   88 +++---
 demos/gtk-demo/changedisplay.c     |  204 +++++++-------
 demos/gtk-demo/combobox.c          |  190 ++++++------
 demos/gtk-demo/dialog.c            |   32 +-
 demos/gtk-demo/editable_cells.c    |    8 +-
 demos/gtk-demo/entry_buffer.c      |   16 +-
 demos/gtk-demo/entry_completion.c  |   94 +++---
 demos/gtk-demo/expander.c          |   18 +-
 demos/gtk-demo/hypertext.c         |   79 +++---
 demos/gtk-demo/iconview.c          |  241 ++++++++--------
 demos/gtk-demo/iconview_edit.c     |   41 ++--
 demos/gtk-demo/images.c            |  315 ++++++++++-----------
 demos/gtk-demo/infobar.c           |    8 +-
 demos/gtk-demo/links.c             |    4 +-
 demos/gtk-demo/main.c              |  563 ++++++++++++++++++------------------
 demos/gtk-demo/menus.c             |   12 +-
 demos/gtk-demo/offscreen_window.c  |    1 -
 demos/gtk-demo/offscreen_window2.c |    1 -
 demos/gtk-demo/overlay.c           |    2 +-
 demos/gtk-demo/panes.c             |    2 +-
 demos/gtk-demo/pixbufs.c           |    6 +-
 demos/gtk-demo/printing.c          |   30 +-
 demos/gtk-demo/rotated_text.c      |    6 +-
 demos/gtk-demo/sizegroup.c         |   50 ++--
 demos/gtk-demo/spinner.c           |    2 -
 demos/gtk-demo/stock_browser.c     |  129 ++++-----
 demos/gtk-demo/textscroll.c        |   76 +++---
 demos/gtk-demo/textview.c          |    9 +-
 demos/gtk-demo/tree_store.c        |  184 ++++++------
 demos/gtk-demo/ui_manager.c        |  109 ++++----
 gtk/gtkentry.c                     |   15 +-
 35 files changed, 1319 insertions(+), 1356 deletions(-)
---