Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Thu, 31 Aug 2006 05:45:48 +0000 (15:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 31 Aug 2006 05:45:48 +0000 (15:45 +1000)

Trivial merge