24585b9 merge spec file

Authored and Committed by pwouters 15 years ago
    merge spec file
    
        
file modified
+4 -4
file modified
+15 -5