Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2008 22:16:37 +0000 (09:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2008 22:16:37 +0000 (09:16 +1100)
commitc46b8708f443f2f048cf41f693dfe6c133fe53f3
tree329f333a7c9447a9d6e81ad7d5c1734f5f90cef5
parent7e15e09f677f0167dd6b1cec2ccacdd8608e02c7
parent31fac9d66b0cba7a00b0887715cf7b7104108180
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 7fc3669b9dc34514d8749d3941514fdae7d0f700)