Merge tag 'upstream/1.8.5'
authorRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:46:54 +0000 (17:46 +0100)
committerRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:46:54 +0000 (17:46 +0100)
Upstream version 1.8.5

Conflicts:
configure

Reinstate config.guess, config.sub and config.h.in too.


Trivial merge