Miika please give this a quick look to see if you agree with it, so that Dirk can apply it because the current HEAD has beem broken on everything but linux for a couple of days! this patch is a combination of our patches in the other thread plus some additional small fixes. lubomir --