Comment 9 for bug 616469

Hi,

 I collected and counted all the votes, it looks like option (1) has the majority (thanks Mc). I created a patch, please find it attached.

 Please note that I have no idea what else I could ruin with this patch. It solves this issue, please merge it only if it looks ok.

 Thanks,
  Peter