Stephane, I'm swamped: can you take a look at TTimo's patch and apply it if you see fit to? (it's the one in bugzilla, a few messages ago). --ryan.