Merge branch 'master' of axboe@router:/data/git/disktools
authorJens Axboe <axboe@nelson.home.kernel.dk>
Thu, 27 Oct 2005 06:55:47 +0000 (08:55 +0200)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Thu, 27 Oct 2005 06:55:47 +0000 (08:55 +0200)

Trivial merge