commit changes from mainline

diff --combined scripts/process.in
index d7c6f9990be3074a63b31b3ebbb2787476b70dfa,090f23335417245e740aec36d99443149d22cf6d..6502746978bcf9d7145258cd80927d2aa66d824c
--- 1/scripts/process.in
--- 2/scripts/process.in
+++ b/scripts/process.in
@@@ -396,7 -396,7 +396,7 @@@ EN
                "X-$gProject-PR-Message"  => "forwarded $ref",
                "X-$gProject-PR-Package"  => $data->{package},
                "X-$gProject-PR-Keywords" => $data->{keywords}
-              ],<<END ,[join("\n",@msg)]),'',[@generalbcc,@noticecc],1);
+              ],<<END ,[join("\n",@msg)]),'',[$replyto,@generalbcc,@noticecc],1);
  Your message dated $header{'date'}
  with message-id $header{'message-id'}
  has caused the $gProject $gBug report #$ref,
@@@ -427,7 -427,7 +427,7 @@@ EN
                "X-$gProject-PR-Message"  => "closed $ref",
                "X-$gProject-PR-Package"  => $data->{package},
                "X-$gProject-PR-Keywords" => $data->{keywords}
-              ],<<END ,[$x,join("\n",@msg)]),'',[@generalbcc,@noticecc],1);
+              ],<<END ,[$x,join("\n",@msg)]),'',[$replyto,@generalbcc,@noticecc],1);
  Your message dated $header{'date'}
  with message-id $header{'message-id'}
  and subject line $subject
@@@ -869,10 -869,7 +869,10 @@@ $gMaintaine
  (administrator, $gProject $gBugs database)
  END
      } elsif ($codeletter ne 'U' and
 -             $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/) {
 +             $header{'precedence'} !~ /\b(?:bulk|junk|list)\b/ and
 +           # Workaround for gcc mail loops; bugzilla should do Precedence:
 +           # instead. Deliberately not in CVS. - cjwatson
 +           not exists $header{'x-bugzilla-reason'}) {
          &htmllog("Acknowledgement","sent",$replyto,
                   ($veryquiet ? "Extra info received and filed, but not forwarded." :
                    $codeletter eq 'M' ? "Extra info received and forwarded to maintainer." :