Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 18 Nov 2005 17:27:05 +0000 (09:27 -0800)]

Trivial merge