Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 04:09:26 +0000 (21:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 04:09:26 +0000 (21:09 -0700)

Trivial merge