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

[Hedayat Vatankhah]

commit 1a9ab50849849cba54c98ec2c20b92163b4995e2
Merge: fe56f90 1bb2dab
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Mon Apr 30 00:54:25 2012 +0430

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

 .gitignore     |    2 ++
 os-prober.spec |   13 +++++++++++--
 sources        |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --cc os-prober.spec
index ba0b98e,44006c8..414f4a9
--- a/os-prober.spec
+++ b/os-prober.spec
@@@ -69,9 -72,21 +72,15 @@@ f
  %{_var}/lib/%{name}
  
  %changelog
+ * Sun Apr 29 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.52-2
+ - use correct directory name for setup
+ 
+ * Sun Apr 29 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.52-1
+ - Updated to 1.52, supports win 8
+ 
 -* Wed Mar 28 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.51-1
 -- Update to latest upstream version, 1.51
 -
 -* Sat Jan 21 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.48-3
 +* Sat Jan 21 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.48-2
  - Remove dmraid and lvm2 dependency. bug #770393
  
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.48-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
  * Mon Jul 25 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.48-1
  - Updated to 1.48 release