Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Tue, 17 Jan 2006 04:56:49 +0000 (20:56 -0800)]

Trivial merge