SP2 supercedes SP1. Yes, that means prior fixes are rolled up.