db-refactoring: merged changes from log:trunk@...:2552
Authored by: jonas 2005-11-23
Parent: [r2552]
Child: [r2554]