8c7f894 Merge branch 'master' into f14

Merged and Committed by rdieter 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	libassuan.spec
    
        
file modified
+6 -1