Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 18 Apr 2008 13:42:55 +0000 (15:42 +0200)
committerAndrew Tridgell <tridge@samba.org>
Fri, 18 Apr 2008 13:42:55 +0000 (15:42 +0200)
commit09e1ed03c7ba71dafd767b46ca57539c6f92e5d0
tree0cdb1087e51579fd6a42be1c43523d4f599cdf9e
parent6a40411fcc7af4c93443b6c55360e22d18bcb236
parent22bbb0ebe67bc1eb4014d399edcf03340fd6c803
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e2489de8de7d6e4839f29166f1881df3550a502d)