Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 8 Nov 2005 02:41:53 +0000 (18:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 8 Nov 2005 02:41:53 +0000 (18:41 -0800)

Trivial merge