4cadde3 Merge branch 'master' into f17

Merged and Committed by rdieter 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kgpg.spec
    	sources
    
        
file modified
+1 -2
kgpg-4.8.80-gpg2.patch kdeutils-4.7.1-gpg2.patch
file renamed
+5 -13
file modified
+23 -8
file modified
+1 -1