[sysbench/f15: 3/3] Merge branch 'master' into f15

[Xavier Bachelot]

commit 9f1c54a0ac9a219b52b4360b8312752b868dae10
Merge: 399d29e 7adb7ad
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 7 00:07:18 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	sysbench.spec

 sysbench.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---