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

[Robert Scheck]

commit 4665b4b5d1ac99c74cd3aa02bb79e7d89e42f78c
Merge: 69d5041 a43097b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 28 04:24:02 2011 +0200

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

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