Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Sep 2007 07:43:57 +0000 (00:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Sep 2007 07:43:57 +0000 (00:43 -0700)

Trivial merge