commit 4cf587e2314b686deda240c9d0679f242046bf3c
Merge: 0cfc1af5 d272e241
Author: dankert 
Date:   Sat Jan 16 00:08:39 2010 +0100

    Zweig-Zusammenfuehrung