ec2c42 Merge branch 'master' into f19

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	ark.spec
    	sources
    
        
file modified
+5 -1
file modified
+25 -3
file modified
+1 -1