Merged from Version-2-0-7 trunc; 2.0.7 closed
Authored by: jost2345 2005-08-18
Parent: [r324]
Child: [r326]