Nathalie Furmento d61d7d6d9a merge trunk -r 9571:9579 12 lat temu
..
overlap.c d61d7d6d9a merge trunk -r 9571:9579 12 lat temu