From: Stephane Glondu <steph@glondu.net>
Date: Wed, 4 Aug 2010 01:52:29 +0000 (-0400)
Subject: Merge commit 'upstream/3.12.0' into 312/master
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~329
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f4bd82ad6a98f3bb3f2228eafc9a71840d978736;p=ocaml.git

Merge commit 'upstream/3.12.0' into 312/master
---

f4bd82ad6a98f3bb3f2228eafc9a71840d978736