mesa: Changes to 'softpipe_0_1_branch'

[Keith Whitwell]

 src/mesa/drivers/dri/intel_winsys/intel_context.c       |   15 ------------
 src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c |   20 +++++++++++++++-
 2 files changed, 19 insertions(+), 16 deletions(-)

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

New commits:
commit 07fd9ad7bbd6de8d2beaa5202daecb7dac861899
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Fri Aug 10 10:20:35 2007 +0100

    Fix merge issue