8283bf8 - merge with F-7 version

Authored and Committed by awjb 16 years ago
    - merge with F-7 version
    
        
file modified
+1 -1
file modified
+24 -7