Merge ssh://git.samba.org/data/git/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Thu, 22 Nov 2007 02:31:35 +0000 (18:31 -0800)
committerJames Peach <jpeach@samba.org>
Thu, 22 Nov 2007 02:31:35 +0000 (18:31 -0800)
commit64b54e534008a1ac36b9ba21726ca0954fe00d63
tree5a5e0f42c70d4afa14ba689bf4f97af321432510
parentfebaaae2021c2993d265cc48cf9fbef05cb4ed1b
parent7ef6c19074495110d5c0b698b05c4ee52a0744d6
Merge ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 660ea443364e949ed06c28b00f0e1c3757f0da27)