[cpuid/el5: 6/6] Merge branch 'f20' into el5

[Fabian Affolter]

commit 3019b1d65f49b2a4badea90928e645d0cea4cf53
Merge: e7f6757 fa0f84c
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jan 25 21:14:36 2014 +0100

    Merge branch 'f20' into el5
    
    Conflicts:
    	.gitignore

 .gitignore |    5 ++---
 cpuid.spec |   47 +++++++++++++++++++++++++----------------------
 sources    |    2 +-
 3 files changed, 28 insertions(+), 26 deletions(-)
---