Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 26 Feb 2013 20:55:43 +0000 (21:55 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 26 Feb 2013 20:55:43 +0000 (21:55 +0100)

Trivial merge