Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
commitd1b40b4ee52132fade72a219d0776c326a53efaf
treec15e5af38a45445cb538c1bb7f0b10e077e4123b
parentbe2be0779e118534b234971f668bc05f833ba8a7
parent655ec1aa063a103f8fc2da6396c58faa09afc38a
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit f7521525e42d62e96cc6f55fb1b23644a60fc36d)