Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Fri, 2 Mar 2007 20:23:12 +0000 (21:23 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 2 Mar 2007 20:23:12 +0000 (21:23 +0100)

Trivial merge