Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Mon, 12 Mar 2007 13:20:58 +0000 (14:20 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 12 Mar 2007 13:20:58 +0000 (14:20 +0100)

Trivial merge