Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000 (14:01 -0800)
committerJames Peach <jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000 (14:01 -0800)
commitbf2269a04e5af056037c392fb7f29014b62d1bb2
tree38a2c68c2835bb65725003dd479a3a6fdbee1a51
parent1176e04c76e28d9ee9ab355c5e9edcd1b627ac03
parenta000fa4ee5491ae32c60881b28b3536e88e82e27
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 30cb2d215f1a4a440d5ecaab3f898daa714eee2b)