merged trunk into sqlite3-logging