Merge branch 'master' of ssh://router.home.kernel.dk/data/git/fio
authorJens Axboe <jaxboe@fusionio.com>
Tue, 14 Sep 2010 11:07:05 +0000 (13:07 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 14 Sep 2010 11:07:05 +0000 (13:07 +0200)

Trivial merge