c8d90b Merge branch 'master' into f17

Merged and Committed by Rex Dieter 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	ark.spec
    	sources
    
        
file modified
+1 -2
file modified
+26 -8
file modified
+1 -1