Merge in v2.6.14 by hand
authorPaul Mackerras <paulus@samba.org>
Fri, 28 Oct 2005 03:38:53 +0000 (13:38 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 28 Oct 2005 03:38:53 +0000 (13:38 +1000)

Trivial merge