Merge "output" into "master"

diff --cc .gitignore
index 56d869b2b4951552e97c3d0a5afdf2794216bce1,f8c59fe0c75a72c414585427f21303daca8261b7..c24b805ae8a18a367325e18fd5268672480a848c
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -39,4 -39,5 +39,6 @@@ gitlog-to-changelo
  *.deps
  *.la
  *.libs
+ /arg-nonnull.h
 +/package.m4
+ /unused-parameter.h

diff --cc doc/automake.mk
Simple merge

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

diff --cc src/language/stats/factor.c
index 29e30c16b4b022b3eb26858507562dedc90f6d0e,cfec4a9a40890d7eb09a4c6bbdcc05c98d810bcd..58d5b868eb5be5d5d2fc685ed1466b4ae40dd52e
--- 1/src/language/stats/factor.c
--- 2/src/language/stats/factor.c
+++ b/src/language/stats/factor.c
@@@ -1,5 -1,5 +1,5 @@@
  /* PSPP - a program for statistical analysis.
--   Copyright (C) 2009 Free Software Foundation, Inc.
++   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --cc src/ui/gui/automake.mk
index cb730ec2def0bee1c0cde000f67294a4db7df2e4,0a827a3a489876cba70598abcf2ee7fbc946a576..a9b6f2123caa9573c35824858ddef552ed3bbb89
--- 1/src/ui/gui/automake.mk
--- 2/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@@ -59,8 -58,10 +59,9 @@@ UI_FILES = 
        src/ui/gui/crosstabs.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/examine.ui \
+       src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
 -      src/ui/gui/message-dialog.ui \
        src/ui/gui/oneway.ui \
        src/ui/gui/psppire.ui \
        src/ui/gui/rank.ui \

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

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