Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Wed, 23 Dec 2009 07:55:54 +0000 (08:55 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 23 Dec 2009 07:55:54 +0000 (08:55 +0100)

Trivial merge