Which term correctly identifies those who enjoy programming/technology: "geek" or "nerd"?

Which term correctly identifies those who enjoy and are involved with programming and technology, geek or nerd?

The most probable term would be "geek", as in "computer geek" (roughly "computer whiz").
(not the US geek from fifty years ago, as the lowest form of circus performer, who did horrible, demeaning things).
Even though a geek is not necessarily smart or into computers, but can be in general a "weird person", the only usage of geek I know in French culture is related to computer.

This thread mentions:

"Nerd" has several meanings/usages.

• One is that of a studious intellectual, meant to be negative but carrying a whiff of envy.
• The other is "awkward pain in the neck".

One (non-official) difference between nerd and geek (in the computer field) could also be in term of general activity:

• "Nerd" = producer
• "Geek" = consumer

Eg. a nerd creates video games, a geek plays the video games.
But those two terms certainly cannot be limited to this simple interpretation.

That being said, I thought the remark from John Hodgman was quite accurate:

Comedian John Hodgman recently spoke at a Washington DC press dinner, following Barack Obama, touting Obama as the first Nerd President, since Obama had admitted to collecting comic books and being a fan of Star Trek. Obama's Nerd intellectualism was contrasted to the "Jock" mentality that had defined the Bush years.
In the midst of this speech Hodgman suddenly referred to Obama as a geek, quickly adding this aside:

"And to those who say, 'Wait, there's a difference between nerds and geeks,' I answer, 'Shut up, nerd!'"

Nicely illustrated by phdcomics:

VonC's answer is more to the point, but I just can't resist the urge to post this Venn diagram:

Image credit.