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

Trivial merge