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

[Markus Mayer]

commit 5af0659a49d0213c32331fb157292be952ee02be
Merge: 03e4c83 8ea667c
Author: Markus Mayer <markus at thinking-guy.(none)>
Date:   Fri Jan 6 22:36:02 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                 |    2 +
 README.Fedora                              |   19 ++++---
 phoronix-test-suite.spec                   |   27 ++++----
 phoronix-test-suite_fix_desktop_file.patch |   29 ---------
 phoronix-test-suite_fix_install-sh.patch   |   51 ----------------
 phoronix-test-suite_fix_install.patch      |   91 ++++++++++++++++++++++++++++
 sources                                    |    2 +-
 7 files changed, 118 insertions(+), 103 deletions(-)
---