Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
authorJelmer Vernooij <jelmer@samba.org>
Thu, 10 Apr 2008 03:25:18 +0000 (05:25 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 10 Apr 2008 03:25:18 +0000 (05:25 +0200)
commit73302b8b08d2528bbfb1eea4e9538e3e545d4641
tree335146ea9146aef768ec8aeb682c761b92d21d46
parentad8e3e41923e20d401294eccd4da028e0f40c904
parent55809f5029788892919bd7f6ec305ae9df858038
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
(This used to be commit 3522c7e2cf8c6d6129d941a08adcbe2ecbe0758d)