martin f. krafft: Merge commit 'debian/nmu/2.6.7-3.1'

[Martin F. Krafft]

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

Author: martin f. krafft <madduck at madduck.net>
Date:   Wed Oct 15 10:06:16 2008 +0200

Merge commit 'debian/nmu/2.6.7-3.1'

Conflicts:
	debian/changelog

---