Relocking your iPhone [Not working?]
TUAW posts a rough guide on how to relock your iPhone to avoid the threat that the upcoming iPhone 1.1.1 update will leave your iPhone in a "permanently inoperable" state.
Following the instructions and restoring your broadband firmware should make your iPhone indistinguishable from an never-unlocked iPhone. Of course, you will lose your ability to use non-AT&T SIM cards.
Update: Seems some have tried with mixed results, so proceed with caution, or wait until a tested/confirmed solution is available. The TUAW post has been updated.
Following the instructions and restoring your broadband firmware should make your iPhone indistinguishable from an never-unlocked iPhone. Of course, you will lose your ability to use non-AT&T SIM cards.
Update: Seems some have tried with mixed results, so proceed with caution, or wait until a tested/confirmed solution is available. The TUAW post has been updated.

Last week, we offered an update on the ongoing trademark dispute in China between Apple and Proview Technology, which claims to have held ownership of the "iPad" trademark there since 2000. ...
Apple is expected to reveal the new iPad at a media event in the first week of March. The new iPad is widely believed to carry a ultra-high resolution 2048x1536 display that exceeds the resolution...
Back in December, The Recording Academy announced that it would be honoring Steve Jobs with a Special Merit Grammy Award. The Trustees Award for Jobs was made in recognition of his contributions to...
Reuters reports that Apple has filed a lawsuit against Motorola Mobility alleging that Motorola has breached a licensing agreement with Qualcomm in its efforts to have a number of Apple's iOS...