Merge the nepi-omf6-perf branch with the last update (traces, ...)
authorJulien Tribino <julien.tribino@inria.fr>
Mon, 22 Sep 2014 12:01:15 +0000 (14:01 +0200)
committerJulien Tribino <julien.tribino@inria.fr>
Mon, 22 Sep 2014 12:01:15 +0000 (14:01 +0200)

Trivial merge