Merge commit 'origin/bug-894' into bug-894
authordirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 21:41:03 +0000 (23:41 +0200)
committerdirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 21:41:03 +0000 (23:41 +0200)

Trivial merge