b06a331 fixes from F-13, rebase to 0.9.5

Authored and Committed by michich 13 years ago
    fixes from F-13, rebase to 0.9.5
    
        
file modified
+1 -1
file modified
+30 -21
file modified
+78 -23
file modified
+1 -1