commit 1f9b00f85cb21f936485b497061340924e623af5
Merge: 46e478ba 80ee84bb
Author: dankert 
Date:   Thu Mar 21 23:36:26 2013 +0100

    Merge vom PC.