r11292: Missed merge from Samba 2.2 many years ago....