[cpuid/el5: 14/14] Merge branch 'master' into el5

[Fabian Affolter]

commit 15781eef86f5508b1a5f64ab347dece8e7aafdc1
Merge: 25bec78 91a4ae2
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jul 15 12:51:39 2012 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	cpuid.spec
    	sources

 .gitignore |    8 ++++++++
 cpuid.spec |   40 +++++++++++++++++++++++++++++++++-------
 sources    |    4 ++++
 3 files changed, 45 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 322a81e,3e5d55d..d7968a1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,9 @@@
  cpuid-20060917.src.tar.gz
++<<<<<<< HEAD
++=======
+ /cpuid-20100901.src.tar.gz
+ /cpuid-20101002.src.tar.gz
+ /cpuid-20110305.src.tar.gz
+ /cpuid-20120225.src.tar.gz
+ /cpuid-20120601.src.tar.gz
++>>>>>>> master
diff --cc cpuid.spec
index 7c00636,ac10b64..7d2a0d4
--- a/cpuid.spec
+++ b/cpuid.spec
@@@ -55,16 -70,16 +70,27 @@@ rm -rf %{buildroot
  * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20060917-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
  
- * Sun Nov 09 2008 Fabian Affolter <fabian at bernewireless.net> - 20060917-4
+ * Sun Nov 09 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-4
+ - Changed %%build section acc. #469590 comment #5
+ 
+ * Sat Nov 08 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-3
+ - Changed %%build section and License acc. #469590 comment #3
+ - fixed %%doc in changelog
+ 
+ * Tue Nov 04 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-2
+ - Switch to ExclusiveArch
+ - remove %%doc from man page and general changes to the man page installation
+ 
++* Sun Nov 09 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-4
 +- Changed %%build section acc. #469590 comment #5
 +
- * Sat Nov 08 2008 Fabian Affolter <fabian at bernewireless.net> - 20060917-3
++* Sat Nov 08 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-3
 +- Changed %%build section and License acc. #469590 comment #3
 +- fixed %%doc in changelog
 +
- * Tue Nov 04 2008 Fabian Affolter <fabian at bernewireless.net> - 20060917-2
++* Tue Nov 04 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-2
 +- Switch to ExclusiveArch
 +- remove %%doc from man page and general changes to the man page installation
 +
- * Sun Nov 02 2008 Fabian Affolter <fabian at bernewireless.net> - 20060917-1
+ * Sun Nov 02 2008 Fabian Affolter <mail at fabian-affolter.ch> - 20060917-1
  - Initial package for Fedora
diff --cc sources
index 8376ab9,0e0f824..8a19091
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +63a9c7833026ba47a24d780f7d70a452  cpuid-20101002.src.tar.gz
++=======
+ 4012dd0dba5e214b59de54db22e5e79b  cpuid-20120601.src.tar.gz
++>>>>>>> master