Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 02:11:04 +0000 (03:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 02:11:04 +0000 (03:11 +0100)
commit196a9267105cb47435e34eb268ac0572452dd119
tree0fe1db3bd8c83e24a5712cdc93bf713ef411d075
parentbd0bfe683386f983318b507c5a614f818cdfb38d
parent0ca20977ef5a228bc0240fb516af6af68ae3b2de
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit d4fb8b0d8644cddfa39655fac87a96edc71b2a73)