Merge commit 'origin/stable'
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 17 Jan 2009 02:47:25 +0000 (11:47 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 17 Jan 2009 02:47:25 +0000 (11:47 +0900)
commita1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1
tree0d51924c93b730029201c5d0e02313fd040d8a87
parent486e95574d796cd1ce703aff4bc5b8f9f3021333
parent056009fe999768b37cba5e12e9fef9901c856d6a
Merge commit 'origin/stable'

Conflicts:

src/language/utilities/include.c
src/ui/terminal/automake.mk
tests/command/insert.sh
Smake
configure.ac
po/en_GB.po
src/language/command.def
src/language/stats/crosstabs.q
src/language/utilities/include.c
src/libpspp/automake.mk
src/ui/gui/automake.mk
src/ui/gui/psppire.c
src/ui/terminal/automake.mk
tests/command/insert.sh