I assume the Model S will be SAE J1772?
Adoption SAE J1772 was adopted on January 14, 2010 by the SAE Motor Vehicle Council. The companies participating in or supporting the revised -2009 standard include GM, Chrysler, Ford, Toyota, Honda, Nissan, and Tesla.
I hope TESLA offers the Mennekes connector (IEC 62196) as an option, at least in Europe. It is mentioned in the same Wikipedia article linked above. The TESLA on board charger implements the same protocol, and little changes should be required to make it charge from 3 phase instead of one - regen braking basically does the same.
It's assumed Tesla will use J1772 on the Model S but they haven't announced that to my knowledge. I'm sure they will though.