Commit 9b5c19ac870eae15039146c55f574eea744d31b3

Nick Mathewson 2010-08-10T11:46:00

Merge branch 'more_pkgconfig'