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

[Markus Mayer]

commit ca55d80858c200bb27e373b7729dab3068843fb7
Merge: 5af0659 7bcb7b1
Author: Markus Mayer <markus at thinking-guy.(none)>
Date:   Sun Jan 8 17:21:39 2012 +0100

    Merge branch 'master' into el6

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