Allow unlinks on dirs
Merge remote-tracking branch 'gideonthomas/mozfest' into ffos1.3-patch