mirror of
https://github.com/samba-team/samba.git
synced 2025-02-14 01:57:53 +03:00
Merging these in - should have been merged back before (will be tidied up later). Jeremy. (This used to be commit 1e9284590f42b61bd730104920bc535bf7dfcbf4)