Merge remote-tracking branch 'mfischer/logrotate' into next

Conflicts:
	config/rootfiles/common/logrotate

diff --cc config/rootfiles/common/logrotate
index 7f3e709ead13609beb54da3f87e38941ad527d58,248a624ba9233ab2042d1fb2ea095699bbb34a49..5800a048637bf37883a7920596cd49fd23dc3dfe
--- 1/config/rootfiles/common/logrotate
--- 2/config/rootfiles/common/logrotate
+++ b/config/rootfiles/common/logrotate
@@@ -1,5 -1,4 +1,6 @@@
 +#etc/logrotate.d
 +etc/logrotate.d/.empty
+ #usr/man/man5/logrotate.5
  #usr/man/man8/logrotate.8
  usr/sbin/logrotate
  var/lib/logrotate.status

diff --cc lfs/logrotate
Simple merge