Merge commit 'origin/stable'
authorBen Pfaff <blp@gnu.org>
Fri, 10 Oct 2008 05:49:13 +0000 (22:49 -0700)
committerBen Pfaff <blp@gnu.org>
Fri, 10 Oct 2008 05:49:13 +0000 (22:49 -0700)
commit015e221b0f8578afee769528572c76387f26c629
treec3f073b9961d48dfc897c28322ee137ea3cbd4d7
parentff46735d4c81b49fa17c8bd26f3f5dd7bde9a15d
parentd9d37c3a04dc15263c561174b87e48a4650b412c
Merge commit 'origin/stable'

Conflicts:

tests/automake.mk
src/language/stats/crosstabs.q
src/ui/gui/main.c
tests/automake.mk