c05a835 Merge branch 'master' into f16

Merged and Committed by lfield 8 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	bdii.spec
    	sources
    
        
file modified
+6 -2
file modified
+2 -1