mesa: Changes to 'mesa_7_0_branch'

[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 2f186a190f5c8c0c0ff2ce1e9b83389f5b7a35e4
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 357893a87308111904b2f44cd254bf0638c4a11b
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Sep 11 16:49:02 2007 +0800

    i965: limit on LOD Bias, fix#11987