Merge pull request #35 from bphinz/buildfixes

Applying xserver115.patch fails on Ubuntu xorg-server source at hunk 2. ...