Merge branch 'master' of ssh://axboe@router.home.kernel.dk/data/git/splice
authorJens Axboe <axboe@nelson.home.kernel.dk>
Tue, 6 Feb 2007 10:00:16 +0000 (11:00 +0100)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Tue, 6 Feb 2007 10:00:16 +0000 (11:00 +0100)

Trivial merge