[phoronix-test-suite/el6: 2/2] Merge branch 'master' into el6

[Markus Mayer]

commit a46f4131509f0e7bc58adee4d6b91549b6b2ac47
Merge: c703949 0f36cc0
Author: Markus Mayer <markus at thinking-guy.fritz.box>
Date:   Mon Apr 9 21:45:08 2012 +0200

    Merge branch 'master' into el6

 .gitignore                            |    1 +
 phoronix-test-suite.spec              |   19 ++++---
 phoronix-test-suite_fix_install.patch |   91 ---------------------------------
 sources                               |    2 +-
 4 files changed, 13 insertions(+), 100 deletions(-)
---