* Merge with Debian a little bit harder, minimising our diffs a bit. * New upstream release, containing no changes other than the security fix for CVE-2005-0088 and an externally-visible module version bump. * Tweak configure.in with upstream fix to resolve FTBFS with bash 3.1.