Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

diff --combined modules/exim/templates/eximconf.erb
index d1b1451a1b408aad1e0cd753006de2fc2802082b,cf0ac232cdde112d7e6eb42defd5cfa946b792e1..e055cceecce0ce0e1ec9809434e43fc72319d823
--- 1/modules/exim/templates/eximconf.erb
--- 2/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@@ -165,7 -165,7 +165,7 @@@ ou
  # expensive, you can specify the networks for which a lookup is done, or
  # remove the setting entirely.
  host_lookup = *
 -dns_ipv4_lookup = !localhost
 +# dns_ipv4_lookup = !localhost (disabled upon sgrans request, zobel, 2010-03-16)
  
  # If this option is set, then any process that is running as one of the
  # listed users may pass a message to Exim and specify the sender's
@@@ -1300,6 -1300,8 +1300,8 @@@ procmail
    check_local_user
    domains = +local_domains
    headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
+   local_part_suffix = -*
+   local_part_suffix_optional
    no_verify
    no_expn
    require_files = $local_part:$home/.procmailrc