Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:13:58 +0000 (14:13 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:13:58 +0000 (14:13 +1100)
commit4aff02ecf18d52ae8e64e0c938ac5edf82a6dcef
tree83a465dbc856bda79864be73f7ecea246e02d19d
parent191d56d41e5af34e78e1ad711fb1c63c189f0b48
parent774b54141a3549448b7bbc5bc69a661ac525df48
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local