mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i965/intel_context.c |    8 +++++---
 src/mesa/drivers/dri/intel/intel_screen.c |   12 +++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit 85063f14ea431b586d710f249563fc73481552c7
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Feb 13 16:08:19 2008 -0800

    [965] Fix ARB_occlusion_query from intel_screen.c merge.
    
    It wasn't being initialized at screen setup, so we were getting stub
    entrypoints even though it was exposed as enabled.  Fixes arbocclude mesa demo.