a57e6d9 Merge branch 'f18' into f17

Merged and Committed by pwouters 11 years ago
    Merge branch 'f18' into f17
    
    Conflicts:
    	nsd.spec
    
        
file modified
+1 -0
file removed
-140
file modified
+7 -5
file modified
+1 -1