12 files changed, 25 insertions, 2 deletions
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index ec452a5929..75b3bb451a 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -58,6 +58,8 @@
 	 read_comments/1, read_comments/2,
 	 read_source/1, read_source/2]).
 
+-compile({no_auto_import,[error/1]}).
+
 -import(edoc_report, [report/2, report/3, error/1, error/3]).
 
 -include("edoc.hrl").
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 37025d6621..96e5ea4631 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -42,6 +42,8 @@
 
 -export([file/1, application/1, packages/1, files/1, toc/1]).
 
+-compile({no_auto_import,[error/1]}).
+
 -import(edoc_report, [report/2, error/1]).
 
 
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl
index 28198467f7..6726d62b53 100644
--- a/lib/hipe/icode/hipe_icode_type.erl
+++ b/lib/hipe/icode/hipe_icode_type.erl
@@ -39,6 +39,8 @@
 	 update__info/2, new__info/1, return__info/1,
 	 return_none/0, return_none_args/2, return_any_args/2]).
 
+-compile({no_auto_import,[min/2,max/2]}).
+
 %%=====================================================================
 
 -include("../main/hipe.hrl").
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
index 4146bd3ced..a9712aa2ba 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
@@ -678,6 +678,11 @@ public class OtpMbox {
 	return m.self.equals(self);
     }
 
+    @Override
+    public int hashCode() {
+        return self.hashCode();
+    }
+
     /*
      * called by OtpNode to deliver message to this mailbox.
      * 
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 0298b382a6..021be8af2a 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -98,6 +98,8 @@
 	 connect_nodes2/3
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -import(mnesia_lib, [set/2, add/2]).
 -import(mnesia_lib, [fatal/2, error/2, verbose/2, dbg_out/2]).
 
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index cfa3f171b2..6b5770d91e 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -49,6 +49,8 @@
 	 system_code_change/4
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -include("mnesia.hrl").
 -import(mnesia_lib, [dbg_out/2, error/2, verbose/2]).
 
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 00ec4740ee..11b792026e 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -182,6 +182,8 @@
 	]).
 	
 	
+-compile({no_auto_import,[error/2]}).
+
 -include("mnesia.hrl").
 -import(mnesia_lib, [val/1, dir/1]).
 -import(mnesia_lib, [exists/1, fatal/2, error/2, dbg_out/2]).
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 5bd93d6b9b..b6eda9ad3a 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -70,6 +70,8 @@
 	 negotiate_protocol_impl/2
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -import(mnesia_lib, [dbg_out/2, verbose/2, error/2, fatal/2, set/2]).
 
 -include("mnesia.hrl").
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index 0ca7bf3f7f..7435b6896a 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -62,6 +62,7 @@
 	 code_change/3
 	]).
 
+-compile({no_auto_import,[error/2]}).
 
 -include("mnesia.hrl").
 -import(mnesia_lib, [set/2, verbose/2, error/2, fatal/2]).
diff --git a/lib/mnesia/src/mnesia_subscr.erl b/lib/mnesia/src/mnesia_subscr.erl
index 93d4a86f7f..415c69d508 100644
--- a/lib/mnesia/src/mnesia_subscr.erl
+++ b/lib/mnesia/src/mnesia_subscr.erl
@@ -43,6 +43,8 @@
 	 code_change/3
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -include("mnesia.hrl").
 
 -import(mnesia_lib, [error/2]).
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index dde1ea17be..b4eb518dd7 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -111,7 +111,8 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
 	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
+	$(INSTALL_DIR) $(RELSYSDIR)/examples
+	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
diff --git a/system/doc/tutorial/c_port.xmlsrc b/system/doc/tutorial/c_port.xmlsrc
index 7e6034807b..b4caa07578 100644
--- a/system/doc/tutorial/c_port.xmlsrc
+++ b/system/doc/tutorial/c_port.xmlsrc
@@ -70,7 +70,7 @@ loop(Port) ->
     {call, Caller, Msg} ->
       Port ! {self(), {command, encode(Msg)}},
       receive
-\011{Port, {data, Data}} ->
+    {Port, {data, Data}} ->
           Caller ! {complex, decode(Data)}
       end,
       loop(Port)