Completion of point 9 of the preparation in the data model redesign document.
Authored by: bugman 2007-03-14
Parent: [r3186]
Child: [r3188]
