[os-prober/f16: 5/5] Merge branch 'f17' into f16

[Hedayat Vatankhah]

commit 3cd5b0f75223f590caf7cfbf041f4568f2dbe911
Merge: 1a9ab50 a2fe84c
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Fri May 11 21:43:45 2012 +0430

    Merge branch 'f17' into f16

 .gitignore                           |    1 +
 os-porber-no-dummy-mach-kernel.patch |   25 +++++++++++++++++++++++++
 os-prober.spec                       |   18 ++++++++++++++----
 sources                              |    2 +-
 4 files changed, 41 insertions(+), 5 deletions(-)
---