Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

	scripts/Makefile.am

diff --cc scripts/Makefile.am
index d5e54b2412508ed6577cf081100cbce91c55a5e5,87ea060305997988fd80212d28e41259effa13a1..9a338fc1334c3fdc5b65701335b879cd3ed7261b
--- 1/scripts/Makefile.am
--- 2/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -57,12 -55,8 +57,13 @@@ CLEANFILES = 
  
  perllibdir = $(PERL_LIBDIR)
  nobase_dist_perllib_DATA = \
 +      Dpkg/Shlibs.pm \
 +      Dpkg/Shlibs/Objdump.pm \
 +      Dpkg/Shlibs/SymbolFile.pm \
 +      Dpkg/ErrorHandling.pm \
+       Dpkg/BuildOptions.pm \
        Dpkg/Gettext.pm \
 +      Dpkg/Version.pm \
        Dpkg.pm
  
  dist_pkglib_SCRIPTS = \

diff --cc scripts/po/POTFILES.in
Simple merge