Merging with jtribino omf stuff
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Mon, 1 Apr 2013 20:51:00 +0000 (22:51 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Mon, 1 Apr 2013 20:51:00 +0000 (22:51 +0200)

Trivial merge