Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 9 Sep 2005 00:26:52 +0000 (17:26 -0700)]

Trivial merge