7f825eb - Pull in some fixes from F-7

Authored and Committed by Ben Konrath 16 years ago
    - Pull in some fixes from F-7
    
        
file added
+21
file modified
+10 -10