Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Oct 2005 23:10:54 +0000 (16:10 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Oct 2005 23:10:54 +0000 (16:10 -0700)

Trivial merge