[os-prober/f17: 3/3] Merge branch 'f18' into f17

[Hedayat Vatankhah]

commit f718695359416b1cffc1e97a795dabd5a3de01b8
Merge: 2d7591a 97b6a93
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Sun May 5 23:17:51 2013 +0430

    Merge branch 'f18' into f17

 os-prober.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---