Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 16:16:35 +0000 (08:16 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 16:16:35 +0000 (08:16 -0800)

Trivial merge