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

[Jes Sorensen]

commit 19edfc719008ebbb5f882e2d376b1f403e4e1c9f
Merge: d09e692 c455789
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu Jan 5 11:24:28 2012 +0100

    Merge branch 'master' into f16

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