Merge commit 'debian/3.11.2-4' into 312/master

diff --cc debian/changelog
index 0c7315ebf7086a59b52f8bd3c299c77ff67fe404,8343573394bbd3f63fec8923b36468f9c2f8d791..e84d3cc43c4fce3b13047508e6472a987e7f2ab4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,15 +1,30 @@@
 +ocaml (3.12.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream release (Closes: #255245, #570920)
 +    - add armel to native architectures; note that the Dynlink module is
 +      not available in native code there: software using it should take care
 +      of this new possibility
 +    - {add,scrape}labels are no longer installed
 +    - remove ocaml{byteinfo,plugininfo,dumpapprox}: all tools merged into
 +      ocamlobjinfo; add binutils-dev to Buid-Depends
 +  * debian/rules: switch to dh with overrides
 +  * Switch source package format to 3.0 (quilt)
 +  * Bump version in debhelper build-dependency (Closes: #562606)
 +
 + -- Stéphane Glondu <glondu@debian.org>  Sat, 24 Jul 2010 14:24:19 +0200
 +
+ ocaml (3.11.2-4) unstable; urgency=high
+ 
+   * Fix FTBFS on i386 due to a bug in previous patch
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Wed, 09 Mar 2011 07:54:58 +0100
+ 
+ ocaml (3.11.2-3) unstable; urgency=high
+ 
+   * Add patch to fix ocamlopt w.r.t. binutils 2.21 (Closes: #617404)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 08 Mar 2011 21:32:54 +0100
+ 
  ocaml (3.11.2-2) unstable; urgency=low
  
    * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el