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

[Robert Scheck]

commit 44c4471b5723f5afea84f5dbb5017da48795743c
Merge: 4665b4b 16eae96
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Nov 22 22:18:10 2011 +0100

    Merge remote branch 'origin/master' into el5

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