merge changes from mainline

diff --cc cgi/bugreport.cgi
index 51ea552af0a0aa414b4917be01c2910ed754a15b,bc669d5e0fb0cc8f44b797f8d244862adef1fb0d..ef397b4bcd2a142392df5d3eecb5bb39c8eaf7a1
--- 1/cgi/bugreport.cgi
--- 2/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@@ -427,7 -445,7 +427,8 @@@ sub handle_record
          }
          # Incomming Mail Message
          my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
 +        $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number">Message received</a> at |.
+         $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"><a name="msg$msg_number">Message received</a> at |.
               htmlsanit("$received\@$hostname") . q| (<a href="| . bugurl($ref, "msg=$msg_number") . '">full text</a>'.q|, <a href="| . bugurl($ref, "msg=$msg_number") . ';mbox=yes">mbox</a>)'.":</p>\n";
          $output .= handle_email_message($record->{text},
                                    ref        => $bug_number,

diff --cc cgi/pkgreport.cgi
Simple merge

diff --cc debian/changelog
Simple merge