Merged trunk into sqlite3-logging