Merge branch 'more_pkgconfig'

author Nick Mathewson <nickm@torproject.org>

Tue, 10 Aug 2010 15:46:00 +0000 (11:46 -0400)

committer Nick Mathewson <nickm@torproject.org>

Tue, 10 Aug 2010 15:46:00 +0000 (11:46 -0400)
author Nick Mathewson <nickm@torproject.org>
Tue, 10 Aug 2010 15:46:00 +0000 (11:46 -0400)
committer Nick Mathewson <nickm@torproject.org>
Tue, 10 Aug 2010 15:46:00 +0000 (11:46 -0400)
diff --cc .gitignore
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 10 Aug 2010 15:46:00 +0000 (11:46 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 10 Aug 2010 15:46:00 +0000 (11:46 -0400)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history