Merge branch 'master' of ssh://axboe@router.home.kernel.dk/data/git/blktrace
authorJens Axboe <axboe@nelson.home.kernel.dk>
Thu, 16 Feb 2006 19:07:11 +0000 (20:07 +0100)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Thu, 16 Feb 2006 19:07:11 +0000 (20:07 +0100)

Trivial merge