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

Trivial merge