Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jaxboe@fusionio.com>
Wed, 26 Jan 2011 19:52:52 +0000 (20:52 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Wed, 26 Jan 2011 19:52:52 +0000 (20:52 +0100)

Trivial merge