Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:14:22 +0000 (10:14 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:14:22 +0000 (10:14 +0100)

Trivial merge