merged version Lynn <=> Jens
The zip-file savings should work but are not extensively tested
Authored by: jkbecker 2006-05-26
Parent: [r290]
Child: [r292]