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

Trivial merge