Fix for the model-free _model_setup() which was not merged from the main 1.3 line.
Authored by: bugman 2011-01-31
Parent: [r12474]
Child: [r12476]