merge from 2.2 - build winbindd and libsmbclient

No match.