Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@carl.home.kernel.dk>
Mon, 5 Mar 2007 18:23:19 +0000 (19:23 +0100)
committerJens Axboe <axboe@carl.home.kernel.dk>
Mon, 5 Mar 2007 18:23:19 +0000 (19:23 +0100)

Trivial merge