[mksh/f14: 7/7] Merge remote branch 'origin/master' into f14

[Robert Scheck]

commit 64fe9ed3e7ff00d1be2fd1bc7f0cf0ab6b2c1614
Merge: 6bd0c7d a43097b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 28 04:18:59 2011 +0200

    Merge remote branch 'origin/master' into f14
    
    Conflicts:
    	mksh.spec

 .gitignore               |    3 +-
 mksh-39c-dblalias.patch  |   31 --------------------
 mksh-39c-fixsetx.patch   |   69 ----------------------------------------------
 mksh-39c-fixsusbst.patch |   47 -------------------------------
 mksh.spec                |   34 +++++++++++-----------
 sources                  |    2 +-
 6 files changed, 19 insertions(+), 167 deletions(-)
---