Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 00:00:15 +0000 (01:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 00:00:15 +0000 (01:00 +0100)
commit227de596865ee910bfc1e0730316e26a0a9caf51
tree5a8e5d5f02ffb70f1be1dfa0b2de0ee41b452056
parent6ded77b777666f8ba81ba049f63b6b26cfbeb7ae
parent124d2ee788f1ac4b201a2843b58be21de358deb0
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test