[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. debian/4.2-1-6-g46f03dc

[Eric Cooper]

The following commit has been merged in the master branch:
commit 46f03dc25526136f272ca6ce540fa7c00e99e35a
Merge: d0f5983f9d25c7e67657e1fbb8dde4dca00723fd 99d526801de9df5e3d6c5bc93d9173a392510726
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Jun 11 16:59:49 2010 -0400

    Merge branch 'upstream'


-- 
approx upstream and debian packaging