Merged code from pysqlite 2.6.0.
25 files changed