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

[Jes Sorensen]

commit 2674074d211c034ec491a0573f2aa1db8fc4b38e
Merge: 28ff781 eb7fece
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu Oct 18 16:55:27 2012 +0200

    Merge branch 'master' into f16

 mdadm.spec       |   19 ++++++++++++++++++-
 mdadm_event.conf |    5 +++++
 2 files changed, 23 insertions(+), 1 deletions(-)
---