mesa: Changes to 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i965/brw_wm_sampler_state.c |    2 +-
 src/mesa/drivers/dri/i965/intel_pixel_bitmap.c   |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

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

New commits:
commit 0aedb9a2042bef9c13358500f93acaf8459a74cb
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Sep 11 16:57:07 2007 +0800

    i965: take the secondary color into account when drawing
    bitmap. fix#10688

commit 241b7bc0a3e6277e15bb45887ad5533ffe692428
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Sep 11 16:49:02 2007 +0800

    i965: limit on LOD Bias, fix#11987