Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 03:14:25 +0000 (14:14 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 03:14:25 +0000 (14:14 +1100)
commit40bcb11d29993991f956cf90894f312b159ed993
tree2fe68423c37d93b2b3ea5ddc63c4a2e85c7829bc
parent1c1c6fca660c304630672e87c20819daf8e008fc
parent7ddcb20d15babbacb2a52bde280fee7eb85d7e69
Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit f39af7c2c35abb794e1dc1a496c1960221f006f2)