[mdadm/f17: 3/3] Merge branch 'master' into f17

[Jes Sorensen]

commit f8f301e5a38d2302df29b306b050a149cc442d50
Merge: b5dc8fd dee78ce
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Wed Oct 17 12:18:40 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	mdadm.spec

 mdadm.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc mdadm.spec
index 88f3b5b,58dc54c..ad565d2
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -134,10 -128,10 +136,14 @@@ f
  %{_initrddir}/*
  
  %changelog
+ * Wed Oct 17 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.5-11
+ - Remove package requirements for udev and initscripts for F18+
+ - Resolves bz864562
+ 
 +* Wed Oct 3 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.5-10
 +- Fix mistake where Fedora 18 systemd macro changes were incorrectly
 +  pulled into the Fedora 16 and Fedora 17 updates of mdadm.
 +
  * Wed Oct 3 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.5-9
  - Resolve issue with ambiguous licenses
  - Resolves bz862761