fef74db - Pull in fixes from the 2.7 branch.

Authored and Committed by Kristian Høgsberg 14 years ago
    - Pull in fixes from the 2.7 branch.
    
        
file modified
+7 -4