Merge branch 'tteras/db_sqlite'
authorTimo Teräs <timo.teras@iki.fi>
Fri, 3 Jun 2011 15:31:21 +0000 (18:31 +0300)
committerTimo Teräs <timo.teras@iki.fi>
Fri, 3 Jun 2011 15:31:21 +0000 (18:31 +0300)

Trivial merge