Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Wed, 14 May 2008 19:09:03 +0000 (21:09 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 14 May 2008 19:09:03 +0000 (21:09 +0200)

Trivial merge