Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jaxboe@fusionio.com>
Tue, 24 May 2011 19:36:35 +0000 (21:36 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 24 May 2011 19:36:35 +0000 (21:36 +0200)

Trivial merge