37a4ba fix merge of latest version from f16

Merged and Committed by Peter Robinson 12 years ago
    fix merge of latest version from f16
    
        
file modified
+1 -19
file modified
+5 -2
file modified
+1 -1