Merge tag 'OTP-17.5'

=== OTP-17.5 ===

Changed Applications:
- asn1-3.0.4
- common_test-1.10
- compiler-5.0.4
- crypto-3.5
- debugger-4.0.3
- dialyzer-2.7.4
- diameter-1.9
- eldap-1.1.1
- erts-6.4
- hipe-3.11.3
- inets-5.10.6
- kernel-3.2
- mnesia-4.12.5
- observer-2.0.4
- os_mon-2.3.1
- public_key-0.23
- runtime_tools-1.8.16
- ssh-3.2
- ssl-6.0
- stdlib-2.4
- syntax_tools-1.6.18
- test_server-3.8
- tools-2.7.2
- wx-1.3.3

Unchanged Applications:
- cosEvent-2.1.15
- cosEventDomain-1.1.14
- cosFileTransfer-1.1.16
- cosNotification-1.1.21
- cosProperty-1.1.17
- cosTime-1.1.14
- cosTransactions-1.2.14
- edoc-0.7.16
- erl_docgen-0.3.7
- erl_interface-3.7.20
- et-1.5
- eunit-2.2.9
- gs-1.5.16
- ic-4.3.6
- jinterface-1.5.12
- megaco-3.17.3
- odbc-2.10.22
- orber-3.7.1
- ose-1.0.2
- otp_mibs-1.0.10
- parsetools-2.0.12
- percept-0.8.10
- reltool-0.6.6
- sasl-2.4.1
- snmp-5.1.1
- typer-0.9.8
- webtool-0.8.10
- xmerl-1.3.7

Conflicts:
	OTP_VERSION
	erts/vsn.mk
	lib/ssl/vsn.mk

2 files changed, 49 insertions, 1 deletions

diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 1ef106e17a..6f7f18a8e7 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,54 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug causing an infinite loop in hostname resolving has
+	    been corrected. To trigger this bug you would have to
+	    enter an bogus search method from a configuration file
+	    e.g .inetrc.</p>
+          <p>
+	    Bug pinpointed by Emil Holmström</p>
+          <p>
+	    Own Id: OTP-12133</p>
+        </item>
+        <item>
+          <p>
+	    The standard_error process now handles the getopts I/O
+	    protocol request correctly and stores its encoding in the
+	    same way as standard_io.</p>
+          <p>
+	    Also, io:put_chars(standard_error, [oops]) could
+	    previously crash the standard_error process. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-12424</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Configuration parameters for the Kernel application that
+	    allows setting socket options for the distribution
+	    sockets have been added. See the application Kernel
+	    documentation; parameters 'inet_dist_listen_options' and
+	    'inet_dist_connect_options'.</p>
+          <p>
+	    Own Id: OTP-12476 Aux Id: OTP-12476 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 15820a0182..e1d447a465 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 3.1
+KERNEL_VSN = 3.2