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

[Hedayat Vatankhah]

commit a2fe84ce086154947e138c8c81eb56d01f8c1ce9
Merge: e600c96 fc4bf8b
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Fri May 11 21:39:35 2012 +0430

    Merge branch 'master' into f17
    
    Conflicts:
    	os-prober.spec

 .gitignore     |    1 +
 os-prober.spec |   10 +++++++---
 sources        |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---