Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@carl.home.kernel.dk>
Fri, 2 Mar 2007 20:43:30 +0000 (21:43 +0100)
committerJens Axboe <axboe@carl.home.kernel.dk>
Fri, 2 Mar 2007 20:43:30 +0000 (21:43 +0100)

Trivial merge