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

[Jes Sorensen]

commit a3253f619705376fd8d2034e384ee921b4f1c029
Merge: 5cf54af c455789
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu Jan 5 11:24:44 2012 +0100

    Merge branch 'master' into f15

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---