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

[John Ralls <jralls src gnome org>]

commit ec2c81baed6ce933057cdacb8a3567004ca0ef3d
Merge: ad8d4dc 83f5e48
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jan 2 23:21:09 2011 -0800

    Merge branch 'master' into quartz-integration

 .../reference/gtk/migrating-ClientSideWindows.sgml |   64 -
 docs/reference/gtk/migrating-GtkAboutDialog.sgml   |   98 -
 docs/reference/gtk/migrating-GtkAction.sgml        |  445 ---
 docs/reference/gtk/migrating-GtkAssistant.sgml     |  178 -
 docs/reference/gtk/migrating-GtkBuilder.sgml       |  102 -
 docs/reference/gtk/migrating-GtkColorButton.sgml   |   54 -
 docs/reference/gtk/migrating-GtkComboBox.sgml      |  213 -
 docs/reference/gtk/migrating-GtkEntry-icons.sgml   |  141 -
 docs/reference/gtk/migrating-GtkFileChooser.sgml   |  163 -
 docs/reference/gtk/migrating-GtkIconView.sgml      |  153 -
 docs/reference/gtk/migrating-GtkLabel-links.sgml   |   24 -
 docs/reference/gtk/migrating-GtkLinkButton.sgml    |   81 -
 docs/reference/gtk/migrating-GtkRecentChooser.sgml |  323 --
 docs/reference/gtk/migrating-GtkTooltip.sgml       |   66 -
 docs/reference/gtk/tmpl/gtkspinbutton.sgml         |  482 ---
 gdk/x11/gdkcursor-x11.c                            |    7 +-
 gdk/x11/gdkdisplay-x11.c                           |    2 +-
 gdk/x11/gdkdnd-x11.c                               |    4 +
 gtk/gtkspinbutton.c                                | 1148 +++---
 gtk/gtkspinbutton.h                                |   38 +-
 po-properties/nb.po                                | 4065 +++++++++++---------
 po/nb.po                                           |  240 +-
 22 files changed, 2968 insertions(+), 5123 deletions(-)
---