Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Thu, 4 Mar 2010 09:42:55 +0000 (10:42 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 4 Mar 2010 09:42:55 +0000 (10:42 +0100)

Trivial merge