Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jaxboe@fusionio.com>
Tue, 19 Jul 2011 14:28:33 +0000 (16:28 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 19 Jul 2011 14:28:33 +0000 (16:28 +0200)

Trivial merge