a4d5a54 Update to current fixes from branch-2.2

Authored and Committed by kwizart 13 years ago
    Update to current fixes from branch-2.2
    
        
file modified
+6 -3