[sysbench/el5: 13/13] Merge branch 'master' into el5

[Xavier Bachelot]

commit 3bdb240e2296746fd1fb62b5fd6b1ed3aaa2252a
Merge: e4d603d 7adb7ad
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 7 00:14:50 2011 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	sysbench.spec

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