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

[Jes Sorensen]

commit 9221e042d5527cbb7c53c2be8e4c64e083d0013a
Merge: 0aaddc8 ca9ac09
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Tue Dec 11 16:51:08 2012 +0100

    Merge branch 'master' into f17

 mdadm.rules |   12 ++++++++++--
 mdadm.spec  |   29 ++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)
---