Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Tue, 1 Jun 2010 12:03:53 +0000 (14:03 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 1 Jun 2010 12:03:53 +0000 (14:03 +0200)

Trivial merge