Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:09:35 +0000 (10:09 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:09:35 +0000 (10:09 +1100)
commit99c61a0804378433f2b577c3cbe3026e14f188a2
tree5fa5f149c1053e0a8ade0d760852a241f13dc606
parent3eef0664c59c7afef117132c1d2ebccf22ad748e
parent53654f5caf701a32b615bed784d78765f351cb73
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit f002a98c7ae0fc93cc738fde1ee62534f8e576ac)