Merge commit 'origin/stable'

author John Darrington <john@darrington.wattle.id.au>

Tue, 31 Mar 2009 07:48:51 +0000 (15:48 +0800)

committer John Darrington <john@darrington.wattle.id.au>

Tue, 31 Mar 2009 07:48:51 +0000 (15:48 +0800)
author John Darrington <john@darrington.wattle.id.au>
Tue, 31 Mar 2009 07:48:51 +0000 (15:48 +0800)
committer John Darrington <john@darrington.wattle.id.au>
Tue, 31 Mar 2009 07:48:51 +0000 (15:48 +0800)
diff --cc Smake
Simple merge
diff --cc doc/statistics.texi
Simple merge
diff --cc src/data/por-file-writer.c
Simple merge
diff --cc src/data/psql-reader.c
Simple merge
author	John Darrington <john@darrington.wattle.id.au>
	Tue, 31 Mar 2009 07:48:51 +0000 (15:48 +0800)
committer	John Darrington <john@darrington.wattle.id.au>
	Tue, 31 Mar 2009 07:48:51 +0000 (15:48 +0800)
		1	2
Smake	patch \|	diff1 \|	diff2 \|	blob \| history
doc/statistics.texi	patch \|	diff1 \|	diff2 \|	blob \| history
src/data/por-file-writer.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/data/psql-reader.c	patch \|	diff1 \|	diff2 \|	blob \| history