878a5ae Merge branch 'f13' into el6

Merged and Committed by xavierb 12 years ago
    Merge branch 'f13' into el6
    
    Conflicts:
    	.gitignore
    	bugzilla.spec
    	sources
    
        
file modified
+5 -0
file modified
+5 -5
file modified
+49 -4
file modified
+1 -1