Merging "omf" branch into "default".
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 21 Feb 2013 09:53:29 +0000 (10:53 +0100)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 21 Feb 2013 09:53:29 +0000 (10:53 +0100)

Trivial merge