Comment 3 for bug 515386

fabo, can you review this patch please ?