Merge branch 'master' of ssh://axboe@router.home.kernel.dk/data/git/splice
authorJens Axboe <axboe@nelson.home.kernel.dk>
Fri, 28 Apr 2006 11:13:00 +0000 (13:13 +0200)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Fri, 28 Apr 2006 11:13:00 +0000 (13:13 +0200)

Trivial merge