Merge commit 'origin/stable'
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 23 Jul 2009 06:15:20 +0000 (08:15 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 23 Jul 2009 06:15:20 +0000 (08:15 +0200)
commitb5c82cc9aabe7e641011130240ae1b2e84348e23
tree836b51d2107f69ba693b5c648b16aa67d67ce146
parent91a5888ad22ff93d212c9534d720d8f8bf52e56b
parent5ee84736663824fe12474b78dace867e42893a14
Merge commit 'origin/stable'

Conflicts:

src/language/stats/t-test.q
src/data/por-file-reader.c
src/data/sys-file-reader.c
src/language/data-io/data-parser.c
src/language/stats/t-test.q
tests/automake.mk