Merge the db-refactoring branch with trunk.
Authored by: jonas 2005-11-24
Parent: [r2554]
Child: [r2556]