From: Jeremy Allison Date: Tue, 15 Jan 2008 23:09:35 +0000 (-0800) Subject: Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test X-Git-Tag: samba-4.0.0alpha6~801^2~3887^2~1 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=e2528bd5fd7ad65e10f218ca5cc6bfd3f8cd326f Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test (This used to be commit 0d989bf90b9b75a057b572bb4369ee3126db1fb8) --- e2528bd5fd7ad65e10f218ca5cc6bfd3f8cd326f