[mdadm/f16: 2/4] Merge branch 'master' into f16

[Jes Sorensen]

commit bda33cbd072cd373a5f9fb255ee29c6d876c7d34
Merge: c833c85 878e56c
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon May 21 12:17:34 2012 +0200

    Merge branch 'master' into f16

 .gitignore |    1 +
 mdadm.spec |   10 ++++++----
 sources    |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)
---