Reverted revisions r19065, r19066 and r19067.
The command used was: svn merge -r19067:19064 .
The idea of the data_store.control absorbing most of generic_fns is not so good!
Authored by: bugman 2013-03-23
Parent: [r19067]
Child: [r19069]