Merge commit 'upstream/3.05'
authorSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:25:32 +0000 (16:25 +0100)
committerSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:25:32 +0000 (16:25 +0100)

Trivial merge