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

[Jes Sorensen]

commit 3749c747607c69c4a5b4f79751743a89b1488b1a
Merge: 39d7efe d450016
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon Jul 16 13:34:53 2012 +0200

    Merge branch 'master' into f17

 mdadm.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---