Merge HEAD from /spare/repo/linux-2.6/.git
authorJeff Garzik <jgarzik@pobox.com>
Tue, 30 Aug 2005 17:32:29 +0000 (13:32 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 30 Aug 2005 17:32:29 +0000 (13:32 -0400)

Trivial merge