commit 5c540e0504b72025ff73e72667fbf4d6d13a686b
Merge: 83a61566 561f53d8
Author: dankert 
Date:   Tue Jan 19 00:08:25 2010 +0100

    Zweig zusammengefuehrt.