Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commitf45849448e8a61646b16c8c87e501d1e8c819ccc
authorJeremy Allison <jra@samba.org>
Sat, 31 May 2008 06:13:23 +0000 (30 23:13 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 31 May 2008 06:13:23 +0000 (30 23:13 -0700)
treeccc6434349d5befbeb65d345257992c2ac77d508
parentc9ee260cc6774ca814532c7b4e9a52ad97c80435
parent92d067497c60c5eab43bae11e6c1236e6cf760bb
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test