Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Tue, 24 Jun 2008 01:57:00 +0000 (18:57 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 24 Jun 2008 01:57:00 +0000 (18:57 -0700)
commit021193844ce74a36fc4932171533714b402b7282
treea9db4b511b197ddc5ec2fe67575a4648b7851b36
parent993d8d50103a0dc1dddc31c86b82cbfe6083f3b3
parent907e394e636896a7c6939f667e122cae574cf7d4
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test