commit 964b19b24b3dbbff009957f21ce9e5bffbc353c2
Merge: faedc991 4cd6a5b0
Author: dankert 
Date:   Tue Oct 13 21:18:00 2009 +0200

    Merge durchgeführt