[cpuid/el6: 4/4] Merge branch 'master' into el6

[Fabian Affolter]

commit 7b62918aee413298cab754481ff1c2643bf5a798
Merge: 645c50b 51dddbd
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jun 16 14:44:10 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore |    7 ++++++-
 cpuid.spec |   16 ++++++++++------
 sources    |    2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 322a81e,3b3609d..360fbac
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,6 @@@
--cpuid-20060917.src.tar.gz
+ /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
+ /cpuid-20130610.src.tar.gz