Update fix for Bug 232270 to utilize better patch from Ian Abbott.
drwxr-xr-x - trunk