fix PR#6809: make PR#6794 (ocamlbuild uses ocamlfind's C flags) trunk-only
fix PR#6809: make PR#6794 (ocamlbuild uses ocamlfind's C flags) trunk-only

The change broke current Oasis, so we reverted it from 4.02 and
included it only in trunk -- oasis should get fixed before 4.03.

git-svn-id: e7e61699ce1738538ffebb75374fbea0924bc775@15992 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

msprotz/ocaml,eliberis/ocaml,yunxing/ocaml,msprotz/ocaml,yunxing/ocaml,eliberis/ocaml,yunxing/ocaml,msprotz/ocaml,gerdstolpmann/ocaml,eliberis/ocaml,yunxing/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,yunxing/ocaml,gerdstolpmann/ocaml,msprotz/ocaml,msprotz/ocaml,eliberis/ocaml,eliberis/ocaml