Merge refs/heads/master from origin
authorJens Axboe <axboe@nelson>
Thu, 8 Sep 2005 06:37:57 +0000 (08:37 +0200)
committerJens Axboe <axboe@nelson>
Thu, 8 Sep 2005 06:37:57 +0000 (08:37 +0200)

Trivial merge