commit e2c3c15843daccb51aba059560b5b311f9670112
Merge: fd6e1f0e f41859ca
Author: dankert 
Date:   Wed Oct 14 23:36:07 2009 +0200

    Merge...