[mdadm/f16: 6/6] Merge branch 'master' into f16

[Jes Sorensen]

commit 7f610b3ba86090520b7e423b9368b6342529745c
Merge: 04fd53a 50f2b33
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Wed Oct 3 15:53:51 2012 +0200

    Merge branch 'master' into f16

 mdadm-3.2.5-Add-zlib-license-to-crc32.c.patch      |   45 ++++++++++++++++++++
 ...eplace-sha1.h-with-slightly-older-version.patch |   39 +++++++++++++++++
 mdadm.spec                                         |   39 ++++++++++++-----
 3 files changed, 111 insertions(+), 12 deletions(-)
---