Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into tmp
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 14:53:10 +0000 (16:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 14:53:10 +0000 (16:53 +0200)
commitd777a83b8478bf09a45eccde38036eccbd219df8
tree66ed803bcaf9ae7fcb848846d994adbb87c2b172
parent9692a48aeb1c22a86a98ca736f173b2332a87480
parent696b58f5dd8370b7ee0670c7a3e5db10234b41ff
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into tmp