Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Mon, 27 Jul 2009 10:28:21 +0000 (12:28 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 27 Jul 2009 10:28:21 +0000 (12:28 +0200)

Trivial merge