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

Trivial merge