copying trunk to branches/branch_dan and branches/brenach_oleg
then I copied in dan's and
oleg's latest version into these branches.
I then added all new files in the branches. I also cleaned out some old/unused files from the branches.


Former-commit-id: 4940fd772746501048d51c7c0968422140582294