mesa: Changes to 'master'

[Aapo Tahkola]

 src/mesa/drivers/dri/r300/r300_ioctl.c |    1 +
 src/mesa/drivers/dri/r300/r300_maos.c  |    6 ++++++
 2 files changed, 7 insertions(+)

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

New commits:
commit 16cec9f7674f9754bc03282d6b5596fbb086acd1
Author: Aapo Tahkola <aet at rasterburn.org>
Date:   Sun May 6 14:28:23 2007 +0300

    r300: fix primary color on rs480