Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 15 Apr 2008 07:54:41 +0000 (09:54 +0200)
committerAndrew Tridgell <tridge@samba.org>
Tue, 15 Apr 2008 07:54:41 +0000 (09:54 +0200)
commite891157b4ec7b2f845fb20c4106d80bf169f2072
tree07db165ca65b063455ab750c133bd19feb7a796e
parent9e60164cae42b5dd95720e48301a2ac57e95482a
parentd2fe61a13a8368ceae30c6e7320c8d3d62fbc485
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test