Partly reverted r9167 - the previous reversion.
The command used was: svn merge -r9167:9166 maths_fns/frame_order_models.py
Authored by: bugman 2009-07-02
Parent: [r9173]
Child: [r9175]
