Merge remote-tracking branch 'origin/patches-2.0' Conflicts: configure.in test/regress_buffer.c test/regress_dns.c
2012-07-26T10:09:13