Merge branch 'master' into kernel36

Conflicts:
	config/rootfiles/common/Mail-Tools

diff --combined config/rootfiles/oldcore/48/filelists/perl-modules
index 1d14c69c17f5c4b829f3f169008e24e5ed64bf0e,9c884b8bc45a933473d04d4e1ea835ecb0f2ef5f..9c884b8bc45a933473d04d4e1ea835ecb0f2ef5f
--- 1/config/rootfiles/oldcore/48/filelists/perl-modules
--- 2/config/rootfiles/core/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