Merge branch 'master'; commit 'origin/stable'
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 2 Mar 2009 22:12:26 +0000 (07:12 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 2 Mar 2009 22:12:26 +0000 (07:12 +0900)
commit8af88c0b7ea2fe75df7e45497988ed0371006a86
tree6a33676212d6f5a2c0d516496131876f62f7ddc5
parentcdcdc851b79c8f9ddcaaa358a80670bbb21d61f2
parent849f1db3053e27a2879542ffebddb55909ce26ae
Merge branch 'master'; commit 'origin/stable'

Conflicts:

src/math/linreg.h
src/ui/gui/psppire-data-editor.c
src/data/sys-file-reader.c
src/libpspp/str.c
src/math/linreg.c