From: Stephane Glondu <steph@glondu.net>
Date: Sat, 15 May 2010 22:13:11 +0000 (+0200)
Subject: Merge branch '312/upstream' into 312/master
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~344
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c66aecba1cf8994161ecf03f370f5c92c820b341;p=ocaml.git

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

c66aecba1cf8994161ecf03f370f5c92c820b341