commit 540675df113fd29a3a97625a3fcb656d396bb251
Merge: fd46c8b2 d2e5ab55
Author: Jan Dankert 
Date:   Thu Oct 25 20:36:30 2012 +0200

    Zusammenführen