Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2008 04:42:43 +0000 (15:42 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2008 04:42:43 +0000 (15:42 +1100)
commite1095673089d12e11a4e17a8d6c5b756cc9f427b
tree963429aabaa1e2a1b2de304d65ae7d08b19b08f9
parent861a85985d2d27f58cb8fa2fef0d445c7dac94c6
parent8ca4b0b0942564afa70b2e8a6d67d65ea8b75e43
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local