martin f. krafft: Actually merge commit 'mdadm-3.1.4'

[Martin F. Krafft]

Module: mdadm
Branch: master
Commit: 903759dfa4d23af8c747bf9912fa9c0e9307c2d0
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=903759dfa4d23af8c747bf9912fa9c0e9307c2d0

Author: martin f. krafft <madduck at debian.org>
Date:   Thu Sep  2 12:00:20 2010 +0200

Actually merge commit 'mdadm-3.1.4'

I am an idiot, this should have been part of
ee523e400d7bcf062e83a8ce0e237ec9e5086c49

Signed-off-by: martin f. krafft <madduck at debian.org>

---