Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Fri, 25 Aug 2006 04:56:07 +0000 (14:56 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 25 Aug 2006 04:56:07 +0000 (14:56 +1000)

Trivial merge