Merge trunk at revision 8006.

diff --cc Bugzilla/Bug.pm
Simple merge

diff --cc Bugzilla/DB/Schema.pm
Simple merge

diff --cc Bugzilla/Install/DB.pm
index e9a3fba4c0f0879b9d9d80a24fe505b00d362672,84267de412eb34623d20c0d38a8ebd1e224d1479..83e46d5518227127857913fbaad4e45b3e8239ac
--- 1/Bugzilla/Install/DB.pm
--- 2/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@@ -656,9 -656,9 +656,12 @@@ sub update_table_definitions 
      # 2011-06-15 dkl@mozilla.com - Bug 658929
      _migrate_disabledtext_boolean();
  
+     # 2011-10-11 miketosh - Bug 690173
+     _on_delete_set_null_for_audit_log_userid();
+ 
 +    # 2011-08-29 rowebb@gmail.com - Bug 679547
 +    $dbh->bz_add_column('bugs', 'master_bug_id', {TYPE => 'INT3'});
 +
      ################################################################
      # New --TABLE-- changes should go *** A B O V E *** this point #
      ################################################################

diff --cc Bugzilla/WebService/Bug.pm
Simple merge

diff --cc template/en/default/global/user-error.html.tmpl
Simple merge