Apply patch with a gotcha from the mailing list
drwxr-xr-x tags
drwxr-xr-x trunk