Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Tue, 12 Feb 2008 21:15:06 +0000 (22:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 12 Feb 2008 21:15:06 +0000 (22:15 +0100)
commit842b4969cd08a8acc5584cfdcf1aaf8a751e4fa3
tree2a15ddb9b689a3d47aa49d06dac8fee2d0d4463f
parent7911308dbc1233838e44c533302f77b03ea41148
parent9620b86e96e8065c0ff6db0d95130ab53581d468
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial