It doesn't appear you've applied both patches. Can you paste the output of your patch command?