Add a missing function to the Loc module in ulexer.ml (so that the current trunk

compiles with the patched camlp4 bundled with fedora 21)

parser/ulexer.ml

@@ -14,6 +14,7 @@ module Loc = struct
   let to_tuple _ = assert false
 
   let merge (x1, x2) (y1, y2) = (min x1 y1, max x2 y2)
+  let smart_merge a b = merge a b
   let join (x1, _) = (x1, x1)
   let move _ _ _ = assert false
   let shift _ _ = assert false