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

[Jes Sorensen]

commit 00654b07fefbb019e65d0b01f21412d3ba0479ec
Merge: aff0342 41680b0
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Fri Oct 19 18:19:01 2012 +0200

    Merge branch 'master' into f17

 mdadm.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---