I also have this problem on occasion. Except with my car the idle is a bit higher than normal and rougher and occurs both at the stoplight or when shifting gears. A blip of the throttle usually works to calm it down at the stoplight.
So it sounds like I need to check the throttle cable slack, gas pedal pivot point, and clean or replace the idle air control valve.