Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@evo.osdl.org>
Thu, 1 Sep 2005 17:58:18 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Thu, 1 Sep 2005 17:58:18 +0000 (10:58 -0700)

Trivial merge