martin f. krafft: Merge branch 'master' into incremental

[Martin F. Krafft]

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

Author: martin f. krafft <madduck at debian.org>
Date:   Fri Jan 29 23:28:18 2010 +1300

Merge branch 'master' into incremental

Conflicts:
	debian/changelog

---