73ea812 Merge remote branch 'origin/master' into f18

Merged and Committed by robert 11 years ago
    Merge remote branch 'origin/master' into f18
    
    Conflicts:
    	.gitignore
    	mksh.spec
    	sources
    
        
file modified
+1 -3
file modified
+17 -2
file modified
+1 -1