[os-prober/f17: 4/4] Merge branch 'master' into f17

[Hedayat Vatankhah]

commit a37385834931f0e15c871a3bda5bb391e71c302e
Merge: a2fe84c 415df35
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Fri May 25 16:59:43 2012 +0430

    Merge branch 'master' into f17

 os-prober-grub2-fedorafix.patch |   13 +++++++++++++
 os-prober-mdraidfix.patch       |   24 ++++++++++++++++++++++++
 os-prober-yaboot-parsefix.patch |   14 ++++++++++++++
 os-prober.spec                  |   19 +++++++++++++++++--
 4 files changed, 68 insertions(+), 2 deletions(-)
---