16bd5e0 Merge remote branch 'origin/master' into el4

Merged and Committed by robert 12 years ago
    Merge remote branch 'origin/master' into el4
    
    Conflicts:
    	.gitignore
    	mksh.spec
    	sources
    
        
file modified
+1 -2
file added
+8
file modified
+35 -30
file modified
+1 -2