Merge branch 'master' into experimental/master

Conflicts:
	debian/changelog

diff --cc debian/changelog
index d8ca43fb81ba1cb557e6ff596ca3a2b227a99856,80e56cff3bd4fc6ee27d4dabb4b29501f66bea9a..ce93e174eac869d5d118939ad96316e64642e42d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -12,7 -9,10 +12,10 @@@ ocaml (3.11.2-1) UNRELEASED; urgency=lo
    * debian/control:
      - Make camlp4-extra depend on ocaml-base-nox
  
 - -- Ralf Treinen <treinen@debian.org>  Sat, 02 Jan 2010 13:42:30 +0100
+   [ Ralf Treinen ]
+   * debian/control.in: bump dependency of ocaml-mode on emacs22 to emacs23.
+ 
 + -- Stéphane Glondu <glondu@debian.org>  Wed, 20 Jan 2010 18:32:10 +0100
  
  ocaml (3.11.1-5) unstable; urgency=low