Looking over this thread, I'd like to offer my input, even though this is 5 years old now.
For the current syllabus (which incidentally I believe is retiring at the end of this year) there are actually 7 P's to remember.
You have your basic four: price, product, promotion, and...