Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 12:36:52 +0000 (13:36 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 12:36:52 +0000 (13:36 +0100)

Trivial merge