Changes to the jw_mapping and model-free codes to reflect the model-free changes of r5220...
Authored by: semor 2008-04-03
Parent: [r5246]
Child: [r5248]
