Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 8 Oct 2012 11:10:04 +0000 (13:10 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 8 Oct 2012 11:10:04 +0000 (13:10 +0200)

Trivial merge