[cpuid/el5] Merged

[Fabian Affolter]

commit e7b58ababd6583070736635f1b1bca8ebacf06f1
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jul 15 12:52:12 2012 +0200

    Merged

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 8a19091..0e0f824 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-63a9c7833026ba47a24d780f7d70a452  cpuid-20101002.src.tar.gz
-=======
 4012dd0dba5e214b59de54db22e5e79b  cpuid-20120601.src.tar.gz
->>>>>>> master