Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15:09 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15:09 -0800)
commite2528bd5fd7ad65e10f218ca5cc6bfd3f8cd326f
treee3589d5cadc7d3ec5209b000b9936b267cd8817f
parentddabc2b00c8b01dfd1c019e2d3a946a766fe4e51
parent742fb9a62038a6cdb9267f24126ecddf264ea398
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 0d989bf90b9b75a057b572bb4369ee3126db1fb8)