Merge tag 'upstream/3.051'
authorSven Hoexter <sven@timegate.de>
Mon, 21 May 2012 17:19:57 +0000 (19:19 +0200)
committerSven Hoexter <sven@timegate.de>
Mon, 21 May 2012 17:19:57 +0000 (19:19 +0200)
Upstream version 3.051


Trivial merge