No, I won't be upgrading.
I'm pretty sure that they'll release a new iphone in the summer then I'll just upgrade to that one.
What are the odds of a new iphone this summer when they release 4.0? I would think Steve Jobs would have announced a new phone this weeks keynote. By him not announcing a new iphone, does that decrease the chance of a new iphone this summer?