From: Stephane Glondu <steph@glondu.net>
Date: Fri, 12 Jun 2009 13:54:14 +0000 (+0200)
Subject: Merge commit 'upstream/3.11.1'
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~405
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ae83f521481b087cdff3f73680c3d12ed154dad0;p=ocaml.git

Merge commit 'upstream/3.11.1'

Merge commit '544244070afa8871a154a64a86aa00a6dbfacb49' into HEAD
---

ae83f521481b087cdff3f73680c3d12ed154dad0