[1.0.X]: Fixed #9610 -- Fixed duplicate uploaded file name mangling when...

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

Backport of r10701 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10702 bcc190cf-cafb-0310-a4f2-bffc1f526a37