Untested attempt to fix Bugzilla #609. Do not merge into 1.3 in any case.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403943