Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 07:00:21 +0000 (17:00 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 07:00:21 +0000 (17:00 +1000)
commit1499a7b160f72d8dfa76d281cca52b4263b54ff0
treec8dc71262f0326af69d000eebbcb28e8ecdfb751
parent0eb4ecc81a2fa1f37e09b60e750854d75ac425a0
parent93d2f8ff9e627dd915b90b77161ce3ee5473fa32
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 7245e62f08e2bda96471318cac612b25697bc3e9)