commit 93b20e3228e7acdadb5b9e1aee924e2727647346
Merge: 969ac91e 1e672fed
Author: Jan Dankert 
Date:   Wed Nov 3 23:59:51 2010 +0100

    Merge