commit 9ac2659782a9349be423dd0c915728bcd4e9bdee
Merge: 55b2e17c 199e0ea9
Author: Jan Dankert 
Date:   Sat Nov 6 00:56:56 2010 +0100

    Merge