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

[Jes Sorensen]

commit 55b0986b12622991ebd2e4b1a1fc3bd82c7e2db9
Merge: 850d1bf 96e611c
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon May 21 13:04:40 2012 +0200

    Merge branch 'master' into f17

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