Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 25 Jan 2008 12:16:34 +0000 (23:16 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 25 Jan 2008 12:16:34 +0000 (23:16 +1100)
commit98d2b00dbe08b1303858be5f85704fa4bd1e7233
tree565407437cc94938e7a8988eaa2d92f6dd9b1261
parent8ef7ddbf895d0126f578fcc46d2cb292addddf2b
parent21f5f4d4409e5a7076194639570f11ec32cf3257
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e042908992cdf3149ffc24472c7f0b1c3f9edef)