commit d9b3678594a16fc728492e0e8cf4f66c68bd55b8
Merge: 77dd76a2 5a866560
Author: dankert 
Date:   Tue Dec 1 00:07:27 2009 +0100

    Merge