Code

Merge commit 'upstream/1.4.7'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 24 Jan 2012 22:08:01 +0000 (23:08 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 24 Jan 2012 22:08:01 +0000 (23:08 +0100)

Trivial merge