Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Fri, 17 Jul 2009 20:33:45 +0000 (22:33 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 17 Jul 2009 20:33:45 +0000 (22:33 +0200)

Trivial merge