Merge branch 3.2

author Petri Lehtinen <petri@digip.org>

Wed, 1 Feb 2012 20:20:41 +0000 (22:20 +0200)

committer Petri Lehtinen <petri@digip.org>

Wed, 1 Feb 2012 20:21:05 +0000 (22:21 +0200)
author Petri Lehtinen <petri@digip.org>
Wed, 1 Feb 2012 20:20:41 +0000 (22:20 +0200)
committer Petri Lehtinen <petri@digip.org>
Wed, 1 Feb 2012 20:21:05 +0000 (22:21 +0200)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_sqlite/cursor.c
Simple merge
diff --cc Modules/_sqlite/statement.c
Simple merge
author	Petri Lehtinen <petri@digip.org>
	Wed, 1 Feb 2012 20:20:41 +0000 (22:20 +0200)
committer	Petri Lehtinen <petri@digip.org>
	Wed, 1 Feb 2012 20:21:05 +0000 (22:21 +0200)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_sqlite/cursor.c	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_sqlite/statement.c	patch \|	diff1 \|	diff2 \|	blob \| history