Merge branch 'master' of ssh://axboe@router/data/git/blktrace
authorroot <root@centera.home.kernel.dk>
Wed, 25 Jan 2006 23:29:47 +0000 (15:29 -0800)
committerroot <root@centera.home.kernel.dk>
Wed, 25 Jan 2006 23:29:47 +0000 (15:29 -0800)

Trivial merge