Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 18 Oct 2012 11:53:16 +0000 (13:53 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 18 Oct 2012 11:53:16 +0000 (13:53 +0200)

Trivial merge