I was toying with the idea of a 5D2, but I've got so many holiday expenses coming up that full frame is going to have to wait for a couple of years.

In the meantime, I'm thinking:
Sigma 30mm 1.4 (Aug 2009)
60D body when it comes out (Q4 2009?). Will probably sell the 40D to part finance.
MPE-65 and Twin Lite macro flash (Q3 2010).

When I eventually move to FF, I will probably keep the 60D as a second body, so I don't immediately have to spend money swapping 10-22 for 17-40 / 16-35 and the 60mm Macro for a 180mm Macro.

[All the above subject to change at a whim!!]