Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 10 Sep 2012 08:03:38 +0000 (10:03 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 10 Sep 2012 08:03:38 +0000 (10:03 +0200)

Trivial merge