Merge from Linus' tree.
authorPaul Mackerras <paulus@samba.org>
Sun, 25 Sep 2005 12:51:50 +0000 (22:51 +1000)
committerPaul Mackerras <paulus@samba.org>
Sun, 25 Sep 2005 12:51:50 +0000 (22:51 +1000)

Trivial merge