Changes to build from inside SDL sourcetree
Merge branch 'xsdl2' of github.com:pelya/xserver into xsdl2