Fixed #9610 -- Fixed duplicate uploaded file name mangling when directory...

Fixed #9610 -- Fixed duplicate uploaded file name mangling when directory contained a dot and file didn't.  Based on patches from fadlytabrani and adurdin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@10701 bcc190cf-cafb-0310-a4f2-bffc1f526a37