Originally I was holding out for the Canon 50D, but now that it's out and reviewed I just don't see the additional cost as being worth it over the 40D. I would love the 5D Mark II, but don't really wish to make the investment right now!
So what I am looking at is this -- there is a Canon 40D kit, that comes with two lenses, a 28-135mm IS and a 70-300mm lens. And it is on sale until the end of the year!

Gives me some time to think about it, anyway. And, naturally, I need lots of accessories. A backpack photo bag instead of the shoulder bag I currently use, a new flash, large capacity CF card. I am also very interested in a converter that will let me use my high quality old FD glass lenses on the EF body cameras. That would be a lot of fun.
Ahh, photography, so many wonderful tools!