mesa: Changes to 'master'

[Brian Paul]

 src/mesa/drivers/dri/i915/server/intel_dri.c    |   27 ++++++++++++------------
 src/mesa/drivers/dri/i915tex/server/intel_dri.c |   27 ++++++++++++------------
 src/mesa/shader/shader_api.c                    |   10 ++++++++
 3 files changed, 37 insertions(+), 27 deletions(-)

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

New commits:
commit 516259d609d1f9c598fefb38d82103211c9463db
Author: Brian <brian at yutani.localnet.net>
Date:   Wed May 9 08:07:10 2007 -0600

    Clean-up in I830AllocVidMem(), s/int/unsigned long/ for ret variable.

commit 3e4302fe3b3cf0d559b1288f3965f800ee35cd41
Author: Brian <brian at yutani.localnet.net>
Date:   Wed May 9 08:04:32 2007 -0600

    Check that texture units/samplers specified with glUniform1i() are legal.