Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 13 Feb 2008 16:03:49 +0000 (17:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 13 Feb 2008 16:03:49 +0000 (17:03 +0100)
commitb14d61a3b8055b7a8172e18e5bd69e7cab6eacdb
tree7e569d03fdbc7232eb6ba8b5900870c656d0520c
parent86f88eb7b51377344eebf0b6fabad0f5459b3f45
parent0c5539e5fedd4123f61d50ee29acdc5a5f0faf76
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial