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

[Markus Mayer]

commit c703949d80083466bc746a3f5c23c58ffa2c1605
Merge: ca55d80 6f4fb8f
Author: Markus Mayer <markus at thinking-guy.(none)>
Date:   Sun Jan 8 17:28:10 2012 +0100

    Merge branch 'master' into el6

 phoronix-test-suite.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---