Tue, 21 Apr 2009 15:18:54 +0100 Alpar Juttner Merge and fix