Merge checked in

Wed Jan 10 16:49:00 GMT 2007

> Mark> The xlib peers (--enable-java-awt=gtk,xlib) seem to be broken:
>Tom> I thought there was some reason I disabled these, but I'm having
Tom> trouble remembering it. I will investigate.
Seems strange to me that the build would compile xlib stuff but not generate
the required headers. I would have expected either or neither.
Please let me know if something in xlib has become incompatible, requiring
code changes. My build system is dead at the moment, but it's being
ressurected, so I'll be able to start looking at it within a week or so if
necessary.