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

[Jes Sorensen]

commit a9d7ad889c5158d9d93bd406d71894f92c624be2
Merge: 9221e04 5e97b2a
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Tue Dec 11 16:54:49 2012 +0100

    Merge branch 'master' into f17

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