0.7.18: Patch to address 404 errors when displaying a page/post that shares a permalink with a trashed page/post, thanks to Tor Johnson


git-svn-id: https://plugins.svn.wordpress.org/custom-permalinks/trunk@869003 b8457f37-d9ea-0310-8a92-e5e31aec5664