Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 13 Oct 2005 23:10:54 +0000 (16:10 -0700)]

Trivial merge