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

[Hedayat Vatankhah]

commit 1007fdc03abbc115e61c57c2ee199736ad3eff98
Merge: a373858 604133c
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Sat Jun 2 21:13:35 2012 +0430

    Merge branch 'master' into f17

 os-prober-usrmovefix.patch |   13 +++++++++++++
 os-prober.spec             |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---