Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Sun, 23 Apr 2006 00:55:56 +0000 (10:55 +1000)
committerPaul Mackerras <paulus@samba.org>
Sun, 23 Apr 2006 00:55:56 +0000 (10:55 +1000)

Trivial merge