From: Stephane Glondu <steph@glondu.net>
Date: Tue, 5 Jul 2011 19:28:17 +0000 (+0200)
Subject: Merge commit 'upstream/3.12.1'
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~295
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a6ff0ea1f9416f34ca054c5608af29632414334b;p=ocaml.git

Merge commit 'upstream/3.12.1'
---

a6ff0ea1f9416f34ca054c5608af29632414334b