0.95-bugfixes: Apply security fix from [3592] and Windows compatibility for same from [3672]

      git-svn-id: http://code.djangoproject.com/svn/django/branches/0.95-bugfixes@4360 bcc190cf-cafb-0310-a4f2-bffc1f526a37