Merge rsync://ozlabs.org/sfr-git/for-paulus/
authorPaul Mackerras <paulus@samba.org>
Sun, 2 Oct 2005 01:12:43 +0000 (11:12 +1000)
committerPaul Mackerras <paulus@samba.org>
Sun, 2 Oct 2005 01:12:43 +0000 (11:12 +1000)

Trivial merge