Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 12 Jun 2012 11:12:57 +0000 (13:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 12 Jun 2012 11:12:57 +0000 (13:12 +0200)

Trivial merge