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

[Hedayat Vatankhah]

commit e545be4f49551b9de0273cc027eb20f91e9d45d4
Merge: f718695 ba908ba
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Sun May 5 23:21:53 2013 +0430

    Merge branch 'f18' into f17

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---