Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libpciaccess

author Ian Romanick <idr@us.ibm.com>

Mon, 15 Jan 2007 19:18:29 +0000 (11:18 -0800)

committer Ian Romanick <idr@us.ibm.com>

Mon, 15 Jan 2007 19:18:29 +0000 (11:18 -0800)
author Ian Romanick <idr@us.ibm.com>
Mon, 15 Jan 2007 19:18:29 +0000 (11:18 -0800)
committer Ian Romanick <idr@us.ibm.com>
Mon, 15 Jan 2007 19:18:29 +0000 (11:18 -0800)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Ian Romanick <idr@us.ibm.com>
	Mon, 15 Jan 2007 19:18:29 +0000 (11:18 -0800)
committer	Ian Romanick <idr@us.ibm.com>
	Mon, 15 Jan 2007 19:18:29 +0000 (11:18 -0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history