As with most stalling/idle issues it's probably because when you took it in the shop, they hosed down the engine bay and got water in the distributor. Let it air dry for a few hours, and you'll be fine.
Ahhhh just kidding, it's probably your IAC valve, search around for it, you'll find all the info you need.
