ccece1c bring changes from f13 back to f12 for bugfixes

Authored and Committed by Seth Vidal 14 years ago
    bring changes from f13 back to f12 for bugfixes
    
        
file modified
+14079 -10581
file modified
+9 -2