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