xf86-video-intel: Changes to 'origin/dri2'

Mon Dec 1 18:56:28 PST 2008

New branch 'origin/dri2' available with the following commits:
commit ee87f7becc2138348ec0d948829db6e86cee86da
Merge: 3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef a5b1e62337d4e8840347bb186db48697f0690a19
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Wed Nov 12 16:40:37 2008 -0500

    Merge commit 'origin/master' into dri2
    
    Conflicts:
    	src/i830_dri.c
    	src/i830_driver.c
    	src/i830_memory.c