Merge commit 'upstream/0.9.6'
authorSven Hoexter <sven@timegate.de>
Sat, 14 Jan 2012 12:30:13 +0000 (13:30 +0100)
committerSven Hoexter <sven@timegate.de>
Sat, 14 Jan 2012 12:30:13 +0000 (13:30 +0100)

Trivial merge