I'll go ahead and merge this so we have it on the trunk and fuzzers etc. can pick up the code. Kito was largely OK with it apart from a few minor issues that have since been fixed. Kito, if you have further remarks or changes I suggest we address them afterwards.
-- Regards Robin
