44053c7 Merge remote-tracking branch 'origin/master' into el6/master

Merged and Committed by rebus 13 years ago
    Merge remote-tracking branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	openvas-client.spec
    	sources
    
        
file modified
+4 -1
file modified
+35 -13
file modified
+1 -1