Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 16:55:38 +0000 (18:55 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 16:55:38 +0000 (18:55 +0200)
commit84c9fbe8466e013e501eecf9b2e7981c1df8232c
tree5bd53b6fcd423893e74724d3b43935cae4943aa5
parentf305c443db8e48efa80eeda8f83073b475dc3fee
parentd9770b651f61a0b70d6afa4610fadc7f199e1d98
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test