Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@carl.home.kernel.dk>
Mon, 26 Feb 2007 11:57:32 +0000 (12:57 +0100)
committerJens Axboe <axboe@carl.home.kernel.dk>
Mon, 26 Feb 2007 11:57:32 +0000 (12:57 +0100)

Trivial merge