Mix-ins
I had no idea that Microsoft prefers mix-in over mashup. Adena suggests it may have something to do with ice cream. I thought it was more likely to have come from Lisp, but a little research indicates that ultimately, the term was inspired by Steve's Ice Cream.