mesa: Changes to 'master'

[Oliver McFadden]

 src/mesa/drivers/dri/r300/r300_emit.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

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

New commits:
commit b04270393574e99184f729a757af7f46ebef5e56
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Fri May 25 21:43:24 2007 +0000

    r300: Use #if 0 for disabled code.