Chrismas Cleanup.

Alan Cox closed XFree86 Bug 525. Unfortunately it was not a Chrismas gift, but he just splitted the bug into several hopefully more manageable bugs.