Merge remote-tracking branch 'origin/master' into gtk3

Conflicts:
	INSTALL

diff --cc INSTALL
index 6223aa376dbe0034abd5d4c71838ddc69a3ed120,093138be4572ceeef3b087e08943e2dc7267fa6c..03739d5816f7c884a5078e5758f45465a53ee4ce
--- 1/INSTALL
--- 2/INSTALL
+++ b/INSTALL
@@@ -56,9 -63,10 +63,10 @@@ The following packages are required to 
  
  The following packages are required to enable PSPP's graphing
  features.  If you cannot arrange to install them, you must run
- `configure' with --without-cairo.
+ `configure' with --without-cairo (in which case you will get no graphing
+ capability).
  
 -    * Cairo (http://cairographics.org/), version 1.5 or later.
 +    * Cairo (http://cairographics.org/), version 1.12 or later.
  
      * Pango (http://www.pango.org/), version 1.22 or later.
  
@@@ -70,13 -78,15 +78,14 @@@ use the GUI, you must run `configure' w
        0.18 and 0.19 have a bug that will prevent library detection,
        but other versions should be fine.
  
 -    * GTK+ (http://www.gtk.org/), version 2.16.0 or later.  However
 -      it must be Gtk+ 2.something  - The Gtk+-3.x series will NOT work!
 +    * GTK+ (http://www.gtk.org/), version 3.4.0 or later.
  
      * GtkSourceView (http://projects.gnome.org/gtksourceview/) 
 -      version 2.2 or later.
 +      version 3.4.0 or later.
  
+ The following packages are optional:
  
- Installing the following packages will allow your PSPP binary to read
+ Installing the following packages will allow your PSPP program to read
  Gnumeric files.
  
      * zlib (http://www.zlib.net/).

diff --cc src/ui/gui/psppire-data-sheet.c
Simple merge

diff --cc src/ui/gui/psppire-data-window.c
Simple merge