Merge commit 'origin/v4-0-test' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 18 Jan 2008 06:05:17 +0000 (17:05 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 18 Jan 2008 06:05:17 +0000 (17:05 +1100)
commit130db062bf53cff39fd2d5ac4d5766dc0a98663e
tree5165b525cc3d0927dcd816c9c91b444984bb429a
parent391f089d71b4b51a130819ab681dcd1253f16b8c
parent61a015a786c52008f4471e62750ad93507bce518
Merge commit 'origin/v4-0-test' into 4-0-local
(This used to be commit 51422414bed28f425197519298c6b04a9f4e2c4e)