trunk of 20060611 with some patches