Merge from Linus' tree
authorPaul Mackerras <paulus@samba.org>
Wed, 12 Oct 2005 04:43:32 +0000 (14:43 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 12 Oct 2005 04:43:32 +0000 (14:43 +1000)

Trivial merge