Commits in meego-w40/x11proto-fixes:master