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

[Jes Sorensen]

commit aff034259500391fd49e963a0345fefd30d2c074
Merge: 1783752 70a5b98
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Fri Oct 19 10:29:34 2012 +0200

    Merge branch 'master' into f17

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