[mdadm/f16: 28/28] Merge branch 'f16' of ssh://pkgs.fedoraproject.org/mdadm into f16

[Jes Sorensen]

commit 681aa530f16506bbda1b59a43148af9de627c5b7
Merge: 2ed7a91 96d87d1
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon Jan 7 12:05:06 2013 +0100

    Merge branch 'f16' of ssh://pkgs.fedoraproject.org/mdadm into f16
    
    Conflicts:
    	mdadm.spec

---