Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Tue, 8 Aug 2006 07:09:11 +0000 (17:09 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 8 Aug 2006 07:09:11 +0000 (17:09 +1000)

Trivial merge