Merge branch 'upstreammaster'
Thierry Parmentelat [Wed, 23 May 2012 08:22:54 +0000 (10:22 +0200)]

Trivial merge