commit 84c6a85fbac91a51993eee959723f275c61b2b70
Merge: 1759a360 d01bbf8f
Author: dankert 
Date:   Tue Oct 27 23:13:50 2009 +0100

    Merge vom Desktop-PC