Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Mon, 18 Feb 2013 19:09:28 +0000 (20:09 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Feb 2013 19:09:28 +0000 (20:09 +0100)

Trivial merge