Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into fixbuild
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:34:22 +0000 (22:34 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:34:22 +0000 (22:34 +0200)
commitd2d564ad2e9b7cb0440a30a302176cce333649c7
tree0c91c5b8047c4382babb5e3bbe4199b670c1d5c1
parenta70cbd63d9c398ddcbbaa595ee29343335e89aa7
parent0f0c8519b87481e3473a469cefd51c76b4a7632e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into fixbuild