Bring in DRI2 changes
33 files changed