[sysbench/el6/master: 4/4] Merge branch 'master' into el6

[Xavier Bachelot]

commit a6e75cfd0fc24735e29a285f0403dc86d22d23a2
Merge: 164d74a f5da63f
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Sep 27 21:37:40 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 sources       |    2 +-
 sysbench.spec |   11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---