Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 10 Jan 2008 19:39:02 +0000 (20:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 10 Jan 2008 19:39:02 +0000 (20:39 +0100)
commit84c9b6235ed52770eb6dfae8b75c346d435cb260
tree86e2a652168471e8ac0276b92db564c9cc352120
parent70ca53749862a9cf0c511ca3f89ac132d53ab1ac
parent256659039affd7ce6a028be661fcc77147c0461e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit ad9089c413bfac6dddda5e837d7143fe7a2c29fb)