commit 55b2e17c3e48de9cf5113eda780a7cb6b1ed09bf
Merge: 6c903f95 6a64657d
Author: dankert 
Date:   Fri Nov 5 23:10:35 2010 +0100

    Merge