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

[Jes Sorensen]

commit e9c071537c9c941fc8fc77e5bc491425d9a3ecdb
Merge: 2d1740c ec874c8
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Wed Apr 24 10:26:15 2013 +0200

    Merge branch 'master' into f17

 ...r-do-not-finish-migration-if-there-are-no.patch |   49 ++++++++++++++++++++
 mdadm.spec                                         |   11 ++++-
 2 files changed, 58 insertions(+), 2 deletions(-)
---