Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Tue, 1 Aug 2006 00:37:25 +0000 (10:37 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 1 Aug 2006 00:37:25 +0000 (10:37 +1000)

Trivial merge