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

[John Ralls <jralls src gnome org>]

commit bd86919282d9739fe75c051abd34715efb10d444
Merge: 250e6dd 874dfc2
Author: John Ralls <jralls ceridwen us>
Date:   Sat Apr 16 23:21:13 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkcssprovider.c      |    3 +-
 gtk/gtkcssprovider.h      |    3 +-
 gtk/gtkentry.c            |   30 ++++++-----
 gtk/gtkmenuitem.c         |   18 -------
 gtk/gtkmenushellprivate.h |    2 +
 gtk/gtktreeview.c         |  119 ++++++++++++---------------------------------
 gtk/gtktreeviewcolumn.c   |    3 +
 gtk/gtkwidget.c           |    4 +-
 gtk/gtkwindow.c           |    4 +-
 9 files changed, 61 insertions(+), 125 deletions(-)
---