patch by paper@animecity.nu r=pavlov sr=tor git-svn-id: svn://10.0.0.236/trunk@131335 18797224-902f-48f8-a5cc-f745e15eee43