Merge branch 'master' into experimental/master

diff --cc debian/changelog
index 3c376ae834926a027356c542482d020151d6729b,43242fbf185b10a58462e34afb97b5742932dfb0..9b9238b077699a2dc9421a9b195a2ba20887ae70
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,21 +1,44 @@@
 +ocaml (4.00.0~beta2-1) UNRELEASED; urgency=low
 +
 +  * New upstream beta release
 +
 + -- Stéphane Glondu <glondu@debian.org>  Wed, 13 Jun 2012 10:07:21 +0200
 +
 +ocaml (4.00.0~~dev15+12379-1) experimental; urgency=low
 +
 +  * New upstream snapshot, based on the 4.00 upstream branch
 +    - partially revert r12328 to avoid FTBFS
 +    - the dbm bindings have been removed upstream and are now released
 +      separately
 +    - declare armel and armhf as native architectures supporting
 +      natdynlink
 +  * Run the test-suite
 +    - on kfreebsd-*, skip lib-thread tests (they hang and I am not able
 +      to reproduce it myself)
 +    - on slow architectures, skip some tests that take too much time
 +    - fix asmcomp tests on Hurd (Closes: #661716)
 +    - fix "embedded" test broken by our -custom behaviour
 +
 + -- Stéphane Glondu <glondu@debian.org>  Thu, 19 Apr 2012 09:04:28 +0200
 +
+ ocaml (3.12.1-3) unstable; urgency=low
+ 
+   [ Hendrik Tews ]
+   * Fixes in startup and install files of ocaml-mode:
+     - symlink *el files into elc dir (Closes: #452340)
+     - use debian-pkg-add-load-path-item in emacsen-startup and emacsen-install
+       (Closes: 671559)
+     - compile el files with site-file enabled
+     - use debian-emacs-flavor in emacsen-startup (see #662163)
+ 
+   [ Stéphane Glondu ]
+   * Fix debian/watch so that refman is not reported as a new version
+   * Add some explicit dependencies to avoid spurious Lintian warnings
+     about broken symlinks
+   * Remove duplicate upstream changelog
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Mon, 14 May 2012 07:52:40 +0200
+ 
  ocaml (3.12.1-2) unstable; urgency=low
  
    * Fix compilation on kfreebsd-any: do not add -R$dir in X11 link options