mesa: Changes to 'master'

[Aapo Tahkola]

 src/mesa/drivers/dri/r300/r300_context.h |    2 ++
 src/mesa/drivers/dri/r300/r300_maos.c    |   20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

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

New commits:
commit 857ebc6d472c66dbb6ae9d691adfdcffa53335a8
Merge: 660bdc6... 8445960...
Author: Aapo Tahkola <aapo at aapo-desktop.(none)>
Date:   Sun May 6 19:19:16 2007 +0300

    Merge branch 'master' of git+ssh://aapot@git.freedesktop.org/git/mesa/mesa

commit 660bdc616b01fdca30ca5aebcb5e90b3488e7b49
Author: Aapo Tahkola <aapo at aapo-desktop.(none)>
Date:   Sun May 6 19:18:10 2007 +0300

    rs480: fix textures and secondary color(?). clipping is still busted. tested on r480

commit 88ae491bd224843be963f67db3531857bed68cd1
Author: Aapo Tahkola <aapo at aapo-desktop.(none)>
Date:   Sun May 6 19:10:39 2007 +0300

    r300: fix broken vbos