Merge commit 'origin/v4-0-test' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:25:14 +0000 (09:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:25:14 +0000 (09:25 +1100)
commit80902a2a2b14bc27af0f195d18c40ccef9cb780c
tree792ae2b86096db9026933c7fe22c57ff7a401bf4
parent7054ce65485482d1cc5fa4ff83272feb752e71c2
parent84c9b6235ed52770eb6dfae8b75c346d435cb260
Merge commit 'origin/v4-0-test' into 4-0-local
(This used to be commit 4720f53a92644dd6959e18923924fbe01889111c)