Which generics proposal will be supported for IDEA 4.0

I was wondering what level of generics will be supported in the final release of IDEA 4.0. The current proposed generics syntax (involving Collection<? extends Element> and things like that) is not fully supported by build 944 (the ? stuff isn't support at all), and I'm pretty sure that's going to be the final JDK1.5 syntax because it's what the internal 1.5 builds are using.

Can any IDEA developers comment?