85a44e5 Merge branch 'master' into f16

Merged and Committed by Jiri 12 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	libreport.spec
    	sources
    
        
file modified
+1 -0
file modified
+35 -46
file modified
+1 -1