Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Sat, 29 Apr 2006 06:15:57 +0000 (16:15 +1000)
committerPaul Mackerras <paulus@samba.org>
Sat, 29 Apr 2006 06:15:57 +0000 (16:15 +1000)

Trivial merge