Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 11:32:38 +0000 (13:32 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 11:32:38 +0000 (13:32 +0200)
commitc8dbf00b4490d804e1aac96a3fb66ff726bf9ef6
treedac154501aec6bcd16e6c68d3ecd36dddf9e0162
parent2d9bb0db6c9e1e9b68844f2eede00fd249466cbb
parentc0416a0b73f06ef57db1b83a75433e36b93a9981
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs