[cpuid/el6: 20/20] Merge branch 'el5' into el6

[Fabian Affolter]

commit 645c50b2d8b69cf89b39fceb6a4f29034ce4de15
Merge: 728d6ee e7f6757
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jul 15 13:05:36 2012 +0200

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

 cpuid.spec |   29 ++++++++++++++++++++++-------
 sources    |    2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)
---