Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:43 +0000 (16:15 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:43 +0000 (16:15 +1000)
commit042eefe3eb7ae4873ef2fc7e4e1c8d520f6f083c
treefc228ae8c9d125951b3de7edc4e50e47d75fad69
parentc9c296b6bbe178502e8aded8fa5e38a0f338ee18
parent7fba6c649ba36ca5b76dcfed7b773567c9933077
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit a93b20b85b7b35965c428f1543cb7bbe96e16d42)