merging conflicts with the original "trunk__CLEANUP__Context__2" branch

2 files changed, 2 insertions, 0 deletions

diff --git a/lib/util.ml b/lib/util.ml
index b67539918d..6e22d6be57 100644
--- a/lib/util.ml
+++ b/lib/util.ml
@@ -88,6 +88,7 @@ let matrix_transpose mat =
 let identity x = x
 
 let compose f g x = f (g x)
+let (%) = compose
 
 let const x _ = x
 
diff --git a/lib/util.mli b/lib/util.mli
index 7923c65a3b..bf342c1e66 100644
--- a/lib/util.mli
+++ b/lib/util.mli
@@ -84,6 +84,7 @@ val matrix_transpose : 'a list list -> 'a list list
 
 val identity : 'a -> 'a
 val compose : ('a -> 'b) -> ('c -> 'a) -> 'c -> 'b
+val (%) : ('a -> 'b) -> ('c -> 'a) -> 'c -> 'b
 val const : 'a -> 'b -> 'a
 val iterate : ('a -> 'a) -> int -> 'a -> 'a
 val repeat : int -> ('a -> unit) -> 'a -> unit