I had that problem... I started by cleaning the IAC valve and MAF. I even replaced both of them. That did not help my problems as I did have a vacuum leak due to detiorating manifold gaskets.
However, several people have tried cleaning their IAC and MAF and it helped them with their idling problem.
