In the Keynote Steve demoed the iPhone 4 with Philips screws but on Apple's site you can see the use of Torx screws. Clearly none of us know for sure which will be used but it's odd to see this discrepancy from Apple.
Keynote Philips:
Apple's Site Torx:
Keynote Philips:

Apple's Site Torx:
