Merge branch 'upstreammaster'
Thierry Parmentelat [Tue, 24 Apr 2012 16:51:51 +0000 (18:51 +0200)]

Trivial merge