Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
authorJelmer Vernooij <jelmer@samba.org>
Thu, 29 May 2008 13:51:24 +0000 (15:51 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 29 May 2008 13:51:24 +0000 (15:51 +0200)
commit3947327f8c4ca530d99bc5ac3d1f6f54727f477a
tree7894de2b08437babf4f99b82b2fbc6386a6febd2
parentc823cfadb0b20a0782fc4a8a0b63dcb9116f82be
parent3b1f5d10360ed1b26980d748a7c9be6db5977bd3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs