Merge remote branch 'origin/7.8'
authorDave Airlie <airlied@redhat.com>
Thu, 8 Apr 2010 06:48:41 +0000 (16:48 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 8 Apr 2010 06:48:41 +0000 (16:48 +1000)
commitdff50ff592da7cb1d784fae794dd1647a5445bca
treecd1b29e4001b8afdfff2520a01fcfba6b8b250e9
parent968bf9634ec03e61441834603f13f0c914bbb0ce
parent4b39a0da89f5b07d4a24bc9ce52693e6c2acfe99
Merge remote branch 'origin/7.8'

Conflicts:
Makefile
configs/default
src/mesa/main/version.h