Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...

Conflicts:

	lib/gtksheet/gtksheet.c

diff --cc lib/gtksheet/gtksheet.c
index 3152f894095b73753c4deb62257c0ebdf9119326,8e5e49c9d950b52f39ee6a5d677a66f25a5683e0..9f26115cecf19b01609a72b804cd8da8374f9aaf
--- 1/lib/gtksheet/gtksheet.c
--- 2/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@@ -546,12 -548,7 +546,6 @@@ static void gtk_sheet_button_size_reque
                                                  const GtkSheetButton *button,
                                                  GtkRequisition *requisition);
  
- /* Attributes routines */
- static void init_attributes                    (const GtkSheet *sheet,
-                                                 gint col,
-                                                 GtkSheetCellAttr *attributes);
- 
- 
 -/* Memory allocation routines */
  static void gtk_sheet_real_cell_clear                  (GtkSheet *sheet,
                                                  gint row,
                                                  gint column);