small changes in merged version
added doc-format file
Authored by: keidel 2006-01-30
Parent: [r3621]
Child: [r3623]