[mksh/el4: 39/39] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit 16bd5e08acb553597a670af1f80daeb926f0aa7a
Merge: 479ef1f a43097b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 28 04:25:40 2011 +0200

    Merge remote branch 'origin/master' into el4
    
    Conflicts:
    	.gitignore
    	mksh.spec
    	sources

 .gitignore |    3 +-
 dot-mkshrc |    8 +++++++
 mksh.spec  |   65 ++++++++++++++++++++++++++++++++---------------------------
 sources    |    3 +-
 4 files changed, 45 insertions(+), 34 deletions(-)
---