Ported r2643 from the 1.2 line.
The command used was: $ svn merge -r2642:2643 svn+ssh://bugman@.../svn/relax/1.2
This includes a few small formatting changes to the model-free file.
Authored by: bugman 2006-10-17
Parent: [r2652]
Child: [r2654]
