From ecefd281e3a5f6b3f2ef510e53616d2625558c11 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Dec 11 2011 20:20:28 +0000
Subject: Merge remote branch 'origin/master' into el5


---

diff --git a/.gitignore b/.gitignore
index 095c095..534882d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-mksh-R40c.cpio.gz
+mksh-R40d.cpio.gz
diff --git a/mksh.spec b/mksh.spec
index ee7c1c6..82e7452 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -2,7 +2,7 @@
 
 Summary:          MirBSD enhanced version of the Korn Shell
 Name:             mksh
-Version:          40c
+Version:          40d
 Release:          1%{?dist}
 # BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest)
 License:          MirOS and ISC and BSD
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Dec 11 2011 Robert Scheck <robert@fedoraproject.org> 40d-1
+- Upgrade to 40d
+
 * Tue Nov 22 2011 Robert Scheck <robert@fedoraproject.org> 40c-1
 - Upgrade to 40c
 
diff --git a/sources b/sources
index 1eddf74..ce4f4e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43a79f721091833bdab3d00fbfe54a14  mksh-R40c.cpio.gz
+c6428401103367730a95b99284bf47dc  mksh-R40d.cpio.gz