b671322 Merge branch 'master' into f18

Merged and Committed by patches 10 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	nodejs-fstream.spec
    
        
file modified
+1 -0
file modified
+6 -0
file modified
+1 -2