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

[Robert Scheck]

commit cb90249e1d563284dda9fb88c4adc83cb3a627d0
Merge: 2077fc1 c473ffd
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 11 21:20:49 2011 +0100

    Merge remote branch 'origin/master' into el4

 .gitignore |    2 +-
 mksh.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---