Merge branch 'master' into devel-3.2

Conflicts:
	Incremental.c
	Manage.c
	ReadMe.c
	inventory
	mdadm.8.in
	mdadm.spec
	mdassemble.8
	mdmon.8

diff --cc Manage.c
Simple merge

diff --cc inventory
index d960099840ab91f71cf573f7a5d9af0c49870b13,d05eb3c354319e2217ef5254ae882143e47a96ca..d630f7a4284beb2168f89bf5d5faae4c82814cba
--- 1/inventory
--- 2/inventory
+++ b/inventory
@@@ -8,7 -8,7 +8,8 @@@ ANNOUNCE-3.1.
  ANNOUNCE-3.1.2
  ANNOUNCE-3.1.3
  ANNOUNCE-3.1.4
+ ANNOUNCE-3.1.5
 +ANNOUNCE-3.2
  Assemble.c
  bitmap.c
  bitmap.h