hedwards: There's either 7 or 8 depending upon how one counts. As you imply there, Europe and Asia are on different plates, so they can't be the same continent. They are a connected land mass, so they an be a super continent though. Same goes for the Americas, it's really 3 continents as there are 3 plates involved.
If you define continents by tectonic plates (as most people do, myself included), then you are certainly correct. However, one can also define continents as just contiguous land masses. The 5-continent and 6-continent models are
very much valid, if perhaps a minority view at this point. Although I was replying in a tongue and cheek way, I was not just pulling my response totally out of my rear. ;)
Edit:
Heck, on skimming that wiki, I'll note that the Olympic Committee used the 6-continent (with the Americas as a single Continent) sans Antarctica to form the Olympic Rings symbol.