Please forward port all bugfixes and features from 1.6 to trunk for the time being -- or else, keep track carefully of what you've been doing (for instance, by creating patches and keeping them apart). Otherwise, the merging will be hell later on. Boudewijn