Applying revision 4339 from trunk fixing an issue with read_entries when using flat file database.
Authored by: hansfn 2014-02-16
Parent: [r4339]
Child: [r4341]
