Kim Kardashian Makes Peace with Jon Hamm on '30 Rock' Live

Say what you will about Kim Kardashian ... but she doesn't hold grudges, because our spies tell us she made peace last night with the actor who has been trashing her -- Jon Hamm.

Kim and Jon were both on a special live version of "30 Rock" Thursday night. Kim had a pretty small part but she slayed everyone at the end (take a look at the video).

Jon Hamm was also on the show, did his thing. You'll recall Jon went after Kim with a vengeance last month, saying Kim was stupid and a "f**king idiot."

But after the show last night, we're told they both spoke to each other and, as Kim told a friend, "We laughed it all off." Kim also said Jon was "very sweet and very respectful."