I learned a lot from this article, which seemed very well thought out:
After reading it I got the kit from this guy:
I just received it, and tried it on my Beretta 92. Probably just my imagination, but the gun seems a little smoother. It's a nice kit, with quantities of both oil and grease that should last me a long time.