Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Wed, 18 May 2011 22:12:22 +0000 (23:12 +0100)
committerIan Beckwith <ianb@erislabs.net>
Wed, 18 May 2011 22:12:22 +0000 (23:12 +0100)
commitb6772983c800c6faee7fc793b83975afb6d58bcc
tree44cc1aaebc36486b24f81b3675def06679e5e1af
parent08f588732c09e0a8575e52c7478cbad99aa1b8eb
parent0c4be75eb0966bde4533bc111778e0ab494a93be
Merge branch 'upstream' into stable

Conflicts:
ChangeLog
build-aux/depcomp
build-aux/texinfo.tex
m4/getaddrinfo.m4
top/maint.mk