joela
committed
on 13 Oct 03
some tweaks and simplifications to data model. Matches revision 5 of diagram