Merge commit 'upstream/1.1.5'
authorSven Hoexter <sven@timegate.de>
Mon, 6 Feb 2012 09:11:16 +0000 (10:11 +0100)
committerSven Hoexter <sven@timegate.de>
Mon, 6 Feb 2012 09:11:16 +0000 (10:11 +0100)

Trivial merge