Merge branch 'upstreammaster'
Thierry Parmentelat [Thu, 3 Nov 2011 14:28:50 +0000 (15:28 +0100)]

Trivial merge