From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 10 Apr 2011 08:44:33 +0000 (+0200)
Subject: Merge branch 'master' into kernel36
X-Git-Tag: v2.9-core53~127^2~9
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e865603286978e87a7611cf4471d4844f8ef73e4;hp=-c

Merge branch 'master' into kernel36

Conflicts:
	config/rootfiles/common/Mail-Tools
---

e865603286978e87a7611cf4471d4844f8ef73e4
diff --combined config/rootfiles/oldcore/48/filelists/perl-modules
index 1d14c69c17,9c884b8bc4..9c884b8bc4
--- a/config/rootfiles/oldcore/48/filelists/perl-modules
+++ b/config/rootfiles/oldcore/48/filelists/perl-modules
@@@ -136,20 -136,20 +136,20 @@@ usr/lib/perl5/site_perl/5.12.3/Mail/Mai
  usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm
  usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm
  usr/lib/perl5/site_perl/5.12.3/Mail/Util.pm
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al
- usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al
+ #usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al
  usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm
  usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
  usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm