Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
commit24309dbf4d9622fcfafa29ef98bc0459fdaa814b
authorAndrew Tridgell <tridge@samba.org>
Thu, 24 Jul 2008 04:26:30 +0000 (24 14:26 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 24 Jul 2008 04:26:30 +0000 (24 14:26 +1000)
tree815d143384a8f1a3078c007f5ab3b186655fbbe2
parent4f6646f06988b1fb8be9e0c8ae833bb9792184af
parentbbe895db7144b192981fad9ab6bbd3ebacb8d299
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test