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)
commit51422414bed28f425197519298c6b04a9f4e2c4e
tree4d8516c006c32a6db64f8ffc8e15061f164f46a7
parent673f1805006f879fa5302aab8411767a22488e64
parent7077df3e2e3f171532f6a5ac87d45201736c9c11
Merge commit 'origin/v4-0-test' into 4-0-local