mesa: Changes to 'master'

[Haihao Xiang]

The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 src/mesa/drivers/dri/intel/intel_tex_image.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

       via  7c2a3fced8bbf0915ee4160c23b1752917c1e69d (commit)
      from  33107357a1226b9218fac410a7502a981aac5cc5 (commit)


- Commits -----------------------------------------------
commit 7c2a3fced8bbf0915ee4160c23b1752917c1e69d
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Mon Apr 21 17:34:00 2008 +0800

    intel: fix an assertion failure. fix bug #15575

---------------------------------