mesa: Changes to 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i965/brw_wm_sampler_state.c |    5 ++-
 src/mesa/drivers/dri/i965/intel_context.c        |   30 +++++++++++------------
 src/mesa/drivers/dri/intel/intel_span.c          |   12 ++++-----
 3 files changed, 24 insertions(+), 23 deletions(-)

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

New commits:
commit 7086df58688dc375ffd4c0fb9a9884eae05a6e46
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Thu Jan 10 16:48:33 2008 +0800

    i965: fix bug #14002

commit c30392f187dc45412e579283989992ed4dd2fed8
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Thu Jan 10 16:45:35 2008 +0800

    i965: fix segfault caused by commit e131c46b20241737ceba4856dbe01dcca6dd2c03.