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

[Robert Scheck]

commit ecefd281e3a5f6b3f2ef510e53616d2625558c11
Merge: 44c4471 c473ffd
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 11 21:20:28 2011 +0100

    Merge remote branch 'origin/master' into el5

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