Wed, 06 Feb 2008 10:52:58 +0000 Alpar Juttner Merge (redo buggy merge ad7f593399b0)