Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 Aug 2005 20:08:17 +0000 (13:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 Aug 2005 20:08:17 +0000 (13:08 -0700)

Trivial merge