d36371 merge f12 with rawhide

Authored and Committed by Alasdair G Kergon 13 years ago
1 file changed. 26 lines added. 4 lines removed.
    merge f12 with rawhide
    
        
file modified
+26 -4