From: Stephane Glondu <steph@glondu.net>
Date: Sun, 18 Apr 2010 12:17:14 +0000 (+0200)
Subject: Merge branch '312/upstream' into 312/master
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~356
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4cf93c3c21b31fd6fe9b2ecf25f67398de776bfa;p=ocaml.git

Merge branch '312/upstream' into 312/master
---

4cf93c3c21b31fd6fe9b2ecf25f67398de776bfa