Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 13:21:08 +0000 (15:21 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 13:21:08 +0000 (15:21 +0200)
commitdc74e0fad683cb0ef9ee5996aedadd4c377a0f00
treee33375abeb4ec70f646e420adfe9221e1bb87a2d
parent11703b298685c9984a6a3c3a64eddb8a1a516b90
parentef457187b4372f039f84fbb4f6e4f0fcffd67b5b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3ab9abf40605a4a6b220faeebaef81546a8d87a0)