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 14:53:36 +0000 (16:53 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 14:53:36 +0000 (16:53 +0200)
commitc73a3b837ec16fbb846c6e63a45599fca99b3d0b
tree98b94a16c3a4473727e08e5d4c3bd519b65c246e
parent3ab9abf40605a4a6b220faeebaef81546a8d87a0
parent0e2f6d481b3e35ed392b2b3340b244c77593819c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test