Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Mon, 12 Jun 2006 07:53:34 +0000 (17:53 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 12 Jun 2006 07:53:34 +0000 (17:53 +1000)

Trivial merge