Imported nokia patch nokia-20091602+0m5.diff