Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
authorAdam Jackson <ajax@redhat.com>
Mon, 5 Mar 2012 16:00:14 +0000 (11:00 -0500)
committerAdam Jackson <ajax@redhat.com>
Mon, 5 Mar 2012 16:00:14 +0000 (11:00 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge