Merge rsync://oak/kernels/iseries/work/
authorPaul Mackerras <paulus@samba.org>
Tue, 18 Oct 2005 04:53:41 +0000 (14:53 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 18 Oct 2005 04:53:41 +0000 (14:53 +1000)

Trivial merge