Merge branch 'master' into output

Conflicts:

	NEWS
	configure.ac
	src/output/charts/dummy-chart.c

diff --cc NEWS
Simple merge

diff --cc configure.ac
index 499128b3c5e524aa46f2abb650cf5c43f4b642f4,1ef538bca60ae2c120a433df8aca080f616e5963..1dc8e55896a723ffe50322b9beec0353eda0a116
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -40,7 -40,10 +40,8 @@@ f
  dnl Checks for libraries.
  AC_SYS_LARGEFILE
  AC_SEARCH_LIBS([sin], [m])
 -PSPP_LIBPLOT
+ AC_SEARCH_LIBS([dcgettext], [intl])
  PSPP_LC_PAPER
 -AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
  
  
  AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary only])

diff --cc perl-module/lib/PSPP.pm
Simple merge

diff --cc src/language/stats/correlations.c
Simple merge

diff --cc src/language/stats/roc.c
Simple merge

diff --cc src/language/stats/t-test.q
Simple merge

diff --cc src/ui/gui/automake.mk
Simple merge

diff --cc src/ui/gui/find-dialog.c
Simple merge

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