OK. I thought it was fixed, but it started to do it again, so I didia bunch more research and founf out that the problem was with the Idle Air Control valve (IAC). I had to remove the throttle body, unbolt the IAC valve and clean it with a good cleaner (I used Deep Creap by SeaFoam)as well as the throttle body, then remount the goods and everything is irie. It is purrrring like new.

The Cause:
I believe that it is a combination of cheap California gas and the effects of the EGR. It is something that most will have to deal with sooner or later.

Out.