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

[Robert Scheck]

commit 3d7c8bb14c52f0058b6d44e232aa79af6169bbcc
Merge: 64fe9ed 16eae96
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Nov 22 22:17:44 2011 +0100

    Merge remote branch 'origin/master' into f14

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