Merged r3397 from trunk to fix sqlite3 and pgsql test environments.
Authored by: jplang 2010-04-11
Parent: [r3657]
Child: [r3659]
