Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Thu, 25 Mar 2010 22:03:41 +0000 (23:03 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 25 Mar 2010 22:03:41 +0000 (23:03 +0100)

Trivial merge