Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:23:17 +0000 (12:23 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:23:17 +0000 (12:23 +0200)

Trivial merge