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

Trivial merge