Merge remote branch 'origin/master' into radeon-rewrite
authorDave Airlie <airlied@redhat.com>
Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 7 Jun 2009 06:51:32 +0000 (16:51 +1000)
1  2 
configs/autoconf.in
configure.ac

Simple merge
diff --cc configure.ac
Simple merge