Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 30 Jun 2005 04:03:03 +0000 (21:03 -0700)]

Trivial merge