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

Trivial merge