Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@carl.home.kernel.dk>
Thu, 25 Oct 2007 16:34:14 +0000 (18:34 +0200)
committerJens Axboe <axboe@carl.home.kernel.dk>
Thu, 25 Oct 2007 16:34:14 +0000 (18:34 +0200)

Trivial merge