In addition to Nokia, Motorola says it will make a Wi-Fi/GSM phone: It's a pretty cool looking phone with two hinges--it can open like a regular clam shell phone or open sideways so users can tap on a full (but tiny) keyboard. It runs on Windows Mobile software, has a camera and Java, and can record video. The phone should be out in the second half of 2004, though Motorola is notorious for shipping product after expected. This link has a few photos of what the phone will look like. There ought to be a number of interesting announcements in the GSM world this week as the big annual show is happening in Cannes, France.
There doesn't seem to be much mention in these announcements about battery life, which has been the main concern with including Wi-Fi in small cell phones. Also, there have been plenty of attempts at combining PDAs and cell phones but none seems to have taken off very well so it will be interesting to see if the addition of Wi-Fi is just what it takes to make these combined devices useful.