Merge 3.11.2-2 changelog entry

diff --cc debian/changelog
index e3bd648a9eae23890fd823394b4a8704fe136dd8,ee44ffe77fb6dc8c81ae77073c3ce4b5827f0cb1..8de4c8f7f10b1312d3c667ce5eeee0550aa3a615
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,5 +1,22 @@@
 +ocaml (3.12.0-1) UNRELEASED; urgency=low
 +
 +  [ Stéphane Glondu ]
 +  * 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-2) unstable; urgency=low
+ 
 +  [ Ralf Treinen ]
    * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el
      and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587).